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

[automerger skipped] Merge "Update call sites for getCombinedRegState" am: de4aa08c am: fdcd28fb -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: I3280ee065d11fa1f779cbc6367bd8befe5f022d2