[automerger skipped] Merge "Update call sites for getCombinedRegState" am:...

[automerger skipped] Merge "Update call sites for getCombinedRegState" am: de4aa08c am: fdcd28fb -s ours am: bb28743a -s ours am: b54e0580 -s ours

am skip reason: Merged-In I6c64c77e3dfdcdb9ca3099f5475e8d8d07bc4682 with SHA-1 3e7a8e1e is already in history

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

Change-Id: I8d7ee81fe58025e932216711f2beeee4a08e3324