[automerger skipped] Merge "Remove usage of hidden UserManager api." am: f89e861bbd am: 7874959eb7
am: eeeeb0368b -s ours
am skip reason: change_id Iec05205bc85601e8ea09d859c57a2ed99933c95d with SHA1 2f489b7fe3 is in history

Change-Id: I268d56fdd0bdb8f01205c4ca43327e7a56753bc0