[automerger skipped] Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)" into stage-aosp-master am: 941903e300 -s ours am: 3812d30207 -s ours am: ab33dd5d03 -s ours

am skip reason: Change-Id I2d8f6032d2eb1b5cc8450c917c8aa1c9cd72ac0f with SHA-1 8a6f5d03be is in history

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

Change-Id: I53bba02bc651aefc446d0d8c6362dd46db835458