[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE am: b15aef3a9d -s ours

am skip reason: Change-Id I880dfdaeefbb281dfc7494d4a2fc655f50160b01 with SHA-1 4589456cc9 is in history

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

Change-Id: I68acebf25526120cdb403fef7fe0725d1f0a575f