Merge "fix Telecom out of sync w/ Telephony#defaultVoiceSubId" into tm-qpr-dev am: 374417ff

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



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