Merge "Revert "Revert "A few permission fixes.""" into udc-dev am: a57f466e am: 4deeee0e am: 4032643d

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



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