Merge "Explicitly use overridden or non-overridden roaming state." am: 54740f91

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



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