[automerger skipped] Merge "Fix voice state No Service" am: 7a23496ab6 am: 828ebd455d am: ece01b4ddf -s ours

am skip reason: Merged-In I582deb3083d243fcb7e1f601fdb881b67586c3de with SHA-1 c1782fa01a is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/2032429

Change-Id: I38891f07a16527f11881cd598b7942363bbfa7fb