Update PermissionChecker usages to avoid unnecessary attribution. am: a8ffa3c606
am: 2c150e3e4e

Change-Id: Ib15e3b0c251ca36f843a906752dfa627468ca383