[automerger skipped] Merge "Merge Android 12L" am: 48f1565b20 -s ours am: c72116abcb -s ours am: 3ea5b85b72 -s ours

am skip reason: Merged-In I62fb63a5dcd18a9d93db36350413aab40404114e with SHA-1 46df299ff4 is already in history

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

Change-Id: I46ec99169d81b6c2b732de6b75bf2e95fcfdc482