Merge "Update PermissionChecker usages to avoid unnecessary attribution." into qt-dev
am: 0a71df1f7e

Change-Id: I658626de14fa325e08db3aead53707d8d3e00d3b