Merge "Fix voice state No Service" am: 7a23496ab6

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

Change-Id: Ifc4f57089b83dacce0f1f40e24b469c88eacf493