Merge "[Sb refactor] Proper support for carrierNetworkChangeMode" into udc-dev am: 1153e313 am: be4f9b10 am: b53f8d36 am: dce33e7d

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



Change-Id: I6cf81c3954d5526dac95db3cdc7d01f1e6967b12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>