Merge "Stop using policy engine for permission grant state" into udc-dev am:...

Merge "Stop using policy engine for permission grant state" into udc-dev am: 2554570b am: c3aad6e2

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22710881



Change-Id: Ie43656cfbee2c76f12bea1c7fb95f440a7142a8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>