[automerger skipped] Merge "Merge Android 12" am: 4dffc62f -s ours am:...

[automerger skipped] Merge "Merge Android 12" am: 4dffc62f -s ours am: 16f6c67e -s ours am: dbf925f9 -s ours

am skip reason: Merged-In Icc0b695c320d81ca5c0bfbaf7c1fac9a45f9699c with SHA-1 63628115 is already in history

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

Change-Id: I3abfc8d29c86f81cda7874c6f26dfbe7f8efe895