[automerger skipped] Merge "Merge SP2A.220305.012" into stage-aosp-master am: c50d8c19ab -s ours am: fb9027bb2a -s ours

am skip reason: Merged-In Ieacbda965aa99bf85be92b01035384fbc6a3787f with SHA-1 cf10dc9f3c is already in history

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

Change-Id: I8a1c204af995bd6510541d805dcc241185b6ea59