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

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



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