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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4833704b1494516871d8a2c8ba24c3ea741266d2