Merge "Move or refactor PermissionManagerInternal APIs."