Merge "Add package change watch for RoleManagerService"