Merge "Update OWNERS for some server/pm/User files"
am: 26ba7c0911

Change-Id: I3085297a4d70ee91b92c1b34c349bcf37f0024bc