[automerger skipped] Merge Android 12L am: 8b901538 -s ours am: 302290e2...

[automerger skipped] Merge Android 12L am: 8b901538 -s ours am: 302290e2 -s ours am: 042bf6ff -s ours

am skip reason: Merged-In Idd44decd57c2677d8f771d5d8d92ea019ee014b9 with SHA-1 198b25e6 is already in history

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

Change-Id: I68ef713853a6362e96711d1dc7e0de414057e50f