[automerger skipped] Merge "Merge SP1A.211205.008" am: 4a0ae735ce -s ours am: f445bf6716 -s ours am: 428149a4d1 -s ours am: 6d3e390581 -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: I87973f8c8f16c2cb0683634e9a35ed9d8425eeb8