[automerger skipped] Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855 am:...

[automerger skipped] Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855 am: de298057 -s ours am: c076e23a -s ours

am skip reason: Change-Id Idd3ecd217229d37bfef5bed50c55cd1a837ce852 with SHA-1 f86321c9 is in history

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

Change-Id: I5ad3470df017b27c3104f44d062a9fca0397502a