[automerger skipped] Update PermissionChecker usages to avoid unnecessary attribution. am: a8ffa3c606 am: 2c150e3e4e -s ours
am: c1486de15b

Change-Id: I18634e76b258776e58b9096785f09f33040a7bc3