Merge "Use PermissionUtils" am: 584e907d7a am: 93798f22e8

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I483e0db6e9aac5d8ca8d4aa6912fa6f66b198e87