Merge "Move UserManagerInternal into services.jar"