[automerger skipped] Merge "[DO NOT MERGE] Update PermissionChecker usages to avoid unnecessary attribution."
am: da5e88a4d5 -s ours
am skip reason: change_id Ie5758a1484766b700bd7a01e14c4a9c34d310c49 with SHA1 655e29a858 is in history

Change-Id: If3d793da324f9a16366c5231910af79a0adb6acb