Merge "5G opportunistic data config per-band." am: 93a4ac7070 am: 110cf08815

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1957308

Change-Id: I7ff7773c756ae37a2168ba17f2a0a197ba0892b3