[automerger skipped] Merge "[DO NOT MERGE] Update PermissionChecker usages to avoid unnecessary attribution." am: 95e1ad72b6 -s ours
am: 9681186f38 -s ours
am skip reason: change_id I70f94c1693bbddc47371302388ebf3bea1c988fd with SHA1 a495a1fdde is in history

Change-Id: I30a4a8f900574bb5d342825d96e2af6a4bfd0d27