[automerger skipped] Merge "Merge...

[automerger skipped] Merge "Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918" into stage-aosp-master am: 9b2e1b40 -s ours am: 6581752a -s ours am: 0b3275e4 -s ours

am skip reason: Merged-In I3abfc8d29c86f81cda7874c6f26dfbe7f8efe895 with SHA-1 09b59057 is already in history

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

Change-Id: I77db804b6a776f4b66a5f135ad5f4f825d433965