[automerger skipped] Merge "Merge SQ1A.220105.002 to stage-aosp-master - DO...

[automerger skipped] Merge "Merge SQ1A.220105.002 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master am: 9edbae68 -s ours

am skip reason: Merged-In Ic2ef3b022181de381e899ad13a009b7ef9b27ac7 with SHA-1 1298671d is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/16573452

Change-Id: I223af4fcd16d017de40c06aa47266bac61016450