[automerger skipped] Merge "[DO NOT MERGE] Update PermissionChecker usages to avoid unnecessary attribution." into stage-aosp-master am: b8b4015e2b -s ours
am: d39d83ea34 -s ours
am skip reason: change_id I65c71569d0dd8a40bc6fecabb22c5373dd6e806e with SHA1 7fe065eb66 is in history

Change-Id: I593886fbe10921f435cf59279da910c9c9c5d60f