[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 115dba27 -s ours am: c886e587 -s ours

am skip reason: Change-Id Ia6eb1d221e8a9583167519d9f76d00669fbdca60 with SHA-1 3007e590 is in history

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

Change-Id: I9df1cb7b1af62cebf1c7151f72d0775444f1a959