[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: e03e86498f -s ours
am skip reason: subject contains skip directive

Change-Id: Ib73bdf6404aeeeb73e03baa4a20970b0cff3b11a