[automerger skipped] fix Telecom out of sync w/ Telephony#defaultVoiceSubId...

[automerger skipped] fix Telecom out of sync w/ Telephony#defaultVoiceSubId am: 94085d45 am: a73b43ee -s ours

am skip reason: Merged-In Ia1134daf40edf454bd59f4c4b8585bf5247f3233 with SHA-1 f8096e8b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/20815307



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