[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8084891 am:...

[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8084891 am: 747a761f -s ours am: a3e44443 -s ours

am skip reason: Merged-In I70a309250eb926d9d9aa888d4aa4fd6579fdfe95 with SHA-1 b94c50ec is already in history

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

Change-Id: I2e3e732ece55a2646b6b930c430be4a8214948b0