Merge "Revert changes that use PermissionManager instead of IPermissionManager."