Merge "Add bookatz@ to UserManagerService OWNERS"