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

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



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