Merge "Make RoleManager inject DefaultBrowserProvider into PackageManager."