[automerger skipped] Merge "Adds new configs to support 5g+4g opportunistic...

[automerger skipped] Merge "Adds new configs to support 5g+4g opportunistic switching." into sc-v2-dev am: ae0f5315 -s ours am: 45fef31f -s ours

am skip reason: Merged-In Ia78bde63f2471823bb5765cd8022b1aca0074923 with SHA-1 da76b831 is already in history

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

Change-Id: Ic0bb00063c2cda2bee27e4720478bbb397d7976e