Merge "RESTRICT AUTOMERGE Rename PermissionController resource constants" into tm-dev am: e61854471e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17323523 Change-Id: I8bf5fbddd12cf3745dea2c2830e00320540100d4
This commit is contained in: