[automerger skipped] [conflict] 5G opportunistic data config per-band. 2p:...

[automerger skipped] [conflict] 5G opportunistic data config per-band. 2p: a990c6da am: b35654fb -s ours am: a7017ff9 -s ours

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

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

Change-Id: If01e9a03bb10dc63d7aa34f4813fece26240948d