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

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

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