[automerger skipped] Merge "Merge ab/7061308 into stage." into stage-aosp-master am: 2d1583b215 -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: I8ddcf313fc8c56449e67cddb2be7dd8c448dde95