[automerger skipped] Merge "Merge SP1A.211205.008" am: 4a0ae735ce -s ours

am skip reason: Merged-In Ibedad9118c86318958a03e82c86d819c135cd628 with SHA-1 7d5d88da3d is already in history

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

Change-Id: I93280cb014e47f83bbf5048389f5c0bf9ab389ec