[automerger skipped] Merge Android 12L am: 8b9015386a -s ours am: 302290e26c -s ours

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

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

Change-Id: I203305c45105525eac7cd9df7dc759eea55bb69b