Merge "Merge history of PermissionController" into mainline-prod