Merge "Make PackageManager#arePermissionsIndividuallyControlled system-api"