Merge "Whitelist permission before trying to grant it for role. am: a74705b7...
Merge "Whitelist permission before trying to grant it for role. am: a74705b7 am: 653d8b67" into qt-r1-dev-plus-aosp
am: de923ed1
Change-Id: I74974de911ad80657d3e5a4c7e44c2f490b9d805