tree 19ccbac3b96856d6193ae2350ad7315983ee52ce
parent a2ae9867579c1636d44908b257c3072c03a76744
parent 9626fb4e064f136e439c6ff5e084b53a00d8829a
author Xin Li <delphij@google.com> 1606969521 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1606969521 +0000

[automerger skipped] Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855 am: 9626fb4e06 -s ours

am skip reason: Change-Id I3c472c1178a6c68f524785a5362524ede1d7a158 with SHA-1 12ba0849c6 is in history

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

Change-Id: I40ad787fc2004528b8bb5d95592187de7e887725