tree af200e6aa6df40237cd6349251250a3fab1081b2
parent e14a5d4cf3e7c4df850c3f77b8d9292741b15538
parent 9f99396bbdb6437a114341bad0a6916e6d0a8722
author Jack Yu <jackyu@google.com> 1601542893 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1601542893 +0000

[automerger skipped] Merge "Turn off privilege fallback when using test privilege rules." am: 5efb37e049 am: 60dba8adda am: cfdbcec035 am: 9f99396bbd -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: I6654e52704987f0ffc8f85c000e589875308ed8b