[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 2b8b215d -s ours am: 55d6ded4 -s ours

am skip reason: Change-Id I5da704ac5f6ee45990744f4c12c8940a85455078 with SHA-1 b4dddd49 is in history

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

Change-Id: Ie69fb7bb2b7b9ed398d71937957cb7bae60f7ebb