Merge "A few permission fixes." into udc-dev am: b5788107 am: 79c79c6d am: 424c35ee

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



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