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

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



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