Merge "[DO NOT MERGE] Update PermissionChecker usages to avoid unnecessary attribution." into stage-aosp-master