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

[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 4157a15c -s ours am: 7434c07d -s ours am: 1bb61397 -s ours am: 1b093363 -s ours

am skip reason: Merged-In I56f8e6f6c7d5720d3f96fbda20f30e2d61cbc7f7 with SHA-1 9177ff6d is already in history

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

Change-Id: I92516f39898f917e1739974865ff674e9d1e92b9