Merge history of PermissionController

BUG: 167963264
TEST: TH
Merged-In: I45e784f724181ace950b4ad2637d3b42f3f55f08
Change-Id: Ie75a64df02b2568268f9d08b41778bc16e3de5ad