[automerger skipped] Merge "RESTRICT AUTOMERGE Rename PermissionController resource constants" into tm-dev am: e6185447 am: b15883bc -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ibf4647d5c252ce46a55bbde9fe9e0c365176e420