Merge "Revert "Revert "A few permission fixes.""" into udc-dev am: a57f466e...

Merge "Revert "Revert "A few permission fixes.""" into udc-dev am: a57f466e am: d9c66587 am: 1b462440

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



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