tree 13b18eb40b59a18e13afdc32a5946c116e85f4e7
parent 4fe492fa4a9db2c97f66407bab88757747154be0
parent ed042206714f04f56ae63860e684ef8f840d8bc1
author Bill Yi <byi@google.com> 1604548873 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1604548873 +0000

[automerger skipped] Merge rvc-release RP1A.201105.002 to aosp-master - DO NOT MERGE am: cdb2b25241 am: ed04220671 -s ours

am skip reason: Change-Id I43fee240a64460056cb0b575504dba0895806dd2 with SHA-1 b0da44e0e7 is in history

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

Change-Id: Ib2837d33cfa27d897a26000a1d8913355dd0f639