Merge changes from topic "am-e5b75d9c55dc4a9aad0833466a8c9353"

* changes:
  [automerger skipped] Merge "RESTRICT AUTOMERGE Rename PermissionController resource constants" into tm-dev am: e61854471e am: b15883bc76 -s ours
  [automerger skipped] RESTRICT AUTOMERGE Rename PermissionController resource constants am: 4b2931194e am: 420b017f1f -s ours
This commit is contained in:
Automerger Merge Worker
2022-03-24 16:19:55 +00:00
committed by Android (Google) Code Review

Diff Content Not Available