[automerger skipped] Merge "fix Telecom out of sync w/...

[automerger skipped] Merge "fix Telecom out of sync w/ Telephony#defaultVoiceSubId" into tm-qpr-dev am: 374417ff am: 94b987cd -s ours

am skip reason: Merged-In I56b0eaaaa7a0eb998c0feb0859983dd6c5ddfc1b with SHA-1 a7410a45 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telecomm/+/20814940



Change-Id: I4a2cb45f940f4723eb86e0def6ae159340f93b45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>