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

[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 2a2cc230 -s ours am: d414af20 -s ours

am skip reason: Merged-In I322c6a9d84b2e765389193bc93872fae641b6676 with SHA-1 acd591cf is already in history

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

Change-Id: I1f73c869fdedb02a23009af076f3b787c437151d