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

Change-Id: Ic8a711a2c5611c1ec236d6f7a80047c499ead455