[automerger skipped] Merge "5G opportunistic data config per-band." into...

[automerger skipped] Merge "5G opportunistic data config per-band." into sc-v2-dev am: 3fa3428e -s ours am: d9038788 -s ours

am skip reason: Merged-In I4c6ab1febcf12c6a7e2ab3364bb720e81c58dae7 with SHA-1 a990c6da is already in history

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

Change-Id: Ibbc78f7e1ebecc398a006e59c017365040de5648