[automerger skipped] [DO NOT MERGE] Update PermissionChecker usages to avoid unnecessary attribution. am: 484271bc7e -s ours
am: 21581755fd -s ours
am skip reason: change_id I65c71569d0dd8a40bc6fecabb22c5373dd6e806e with SHA1 7fe065eb66 is in history

Change-Id: I15e73e9ce62d51a0eb70f62242902d68f87f1b25