Merge "[automerger skipped] Explicitly use overridden or non-overridden...

Merge "[automerger skipped] Explicitly use overridden or non-overridden roaming state. am: 032c5355 -s ours" into udc-dev am: e3bd7336 -s ours

am skip reason: Merged-In I1e54aafcca9e720d9a9fe718553e6f13cef1922b with SHA-1 069c6b44 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/22277499



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