tree 6883a2f766cb180985381d64c98fee48ab4d6dc9
parent f5cfffed33891a744efe8668d3cc15a9bb2ab33a
parent ab33dd5d0358c614a7db2a9d7b5604780bdc87a2
author Xin Li <delphij@google.com> 1598998183 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1598998183 +0000

[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