[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: f722eec4 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I08125768793111b154616471c65876e77212d677