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

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

Change-Id: If2153ea1a03ff7652e94fd8b8c94b44bce584550