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

[automerger skipped] Merge "Explicitly use overridden or non-overridden roaming state." am: 54740f91 am: 0931ca99 -s ours am: 35cd6a96 -s ours am: e4221900 -s ours

am skip reason: Merged-In I1e54aafcca9e720d9a9fe718553e6f13cef1922b with SHA-1 032c5355 is already in history

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



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