[automerger skipped] Merge "[DO NOT MERGE] Update PermissionChecker usages to avoid unnecessary attribution." am: 2f1d3ac4f4 -s ours am: 10c6983367 -s ours am: d37c0e07f6 -s ours
am: 6ce721de0f -s ours
am skip reason: subject contains skip directive

Change-Id: I436f1aa49d217832ad38a244d9c5100b9570bc65