[automerger skipped] Merge ab/6749736 in stage. am: 79ddbfff06 -s ours am: 81d456213b -s ours am: 57b47f0a0b -s ours

am skip reason: Change-Id I3ae0e489ccccb59869cfb9a5737790d8c079cbab with SHA-1 8c40d68ff9 is in history

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

Change-Id: I4af127103541146dd4fe2732fac5e15d6f2a0212