[automerger skipped] Merge Android 12L am: e1c74175cd -s ours am: 40eae03a3c -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: Iab3ebc7caee8c083a01aede40dd00abb477ad591