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

am skip reason: Merged-In Icd7d8f1ea7cd2df1050dcaea31e8e75fbfa079e6 with SHA-1 1e9ac2ef is already in history

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

Change-Id: Ie750160ac8f56153a775dcf3e5841b18fc441945