[automerger skipped] Merge "[DO NOT MERGE] Update PermissionChecker usages to avoid unnecessary attribution." am: 2f1d3ac4f4 -s ours
am: 10c6983367 -s ours
am skip reason: change_id I89f4add79a55c3c8d6fbe8d57decaa78fe12f0f9 with SHA1 484271bc7e is in history

Change-Id: I54de93b6b1f4d23fa254d8ce3ea564866925e75f