tree 15e9d5ec582bcae5a258df5628bcab4238f3589f
parent 29a9769bce0b0086a5d1a7652a841b0d2efea688
parent 0e885bb6b314e256713913c67a687297eb4c240f
author Jack Yu <jackyu@google.com> 1601543625 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1601543625 +0000

[automerger skipped] Merge "Turn off privilege fallback when using test privilege rules." am: 5efb37e049 am: 60dba8adda am: cfdbcec035 am: 9f99396bbd -s ours am: 0e885bb6b3 -s ours

am skip reason: Change-Id I61130ed4452a4a1bc60b825ef8b2243058ae9b40 with SHA-1 e14a5d4cf3 is in history

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

Change-Id: Ica8992f00c3210e079a5211bb76367307c8dc35e