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

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



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