Merge "[Sb refactor] Proper support for carrierNetworkChangeMode" into udc-dev...

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

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



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