tree def61436d06075f798f0c95a315be81cddebaf35
parent dd187c6246f3f370549621443b39912a6e11eccd
parent 254b9e45c46b8d919fd8ce1300d11a8f543dd2a6
author Xin Li <delphij@google.com> 1606970381 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1606970381 +0000

[automerger skipped] Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855 am: 9626fb4e06 -s ours am: 254b9e45c4 -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: I18667e9c9957c60f2e59a26bf3591dc2222873fd