Merge "Adds new configs to support 5g+4g opportunistic switching." am:...

Merge "Adds new configs to support 5g+4g opportunistic switching." am: 74b0f760 am: ccfa8c62 am: 5feaf674 am: 7bc25977

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

Change-Id: I7d623a58a0fffbd27d98221ecd886f11e938841b