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

Change-Id: I70f3d3627f4f41e9b382215e8e7176a307fc3e4d