[automerger skipped] Merge "Merge ab/7061308 into stage." into stage-aosp-master am: 2d1583b215 -s ours am: 5763f7b3c7 -s ours am: 47e87ff4ec -s ours

am skip reason: Change-Id I9020009ca9e4681c0abc368d58c4d78de51a8987 with SHA-1 361898ca90 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib34f03db72b650413d78d992b735606700c8d7f1