[automerger skipped] RESTRICT AUTOMERGE Rename PermissionController resource constants am: 4b293119 am: 420b017f -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ia4c283442539866581473936d18ac39d204a4b47