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

Change-Id: I8f0feefa38dc7eee7e5b3b86fa9c83d2d77ba4c1