[automerger skipped] Merge "[DO NOT MERGE] Update PermissionChecker usages to avoid unnecessary attribution." am: 95e1ad72b6 -s ours am: 9681186f38 -s ours am: 64a25b2b0d -s ours
am: 9653511c89 -s ours
am skip reason: subject contains skip directive

Change-Id: I491dbacaf5f90aebc7ab37567457e05319cfd8a3