[automerger skipped] Update PermissionChecker usages to avoid unnecessary attribution. am: a8ffa3c606 am: 2c150e3e4e
am: ae0dc0a920 -s ours
am skip reason: change_id I24e7f16f70ab183a9515e6e298d21ccb9006c3cf with SHA1 a8ffa3c606 is in history

Change-Id: Icadcfa7588010ac7136c4b3d6bce0c9662d13398