Merge "Revert "A few permission fixes."" into udc-dev am: 4048e343 am: 0613c9b4

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



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