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

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



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