Merge "Do not use hidden API UserManager#getPrimaryUser"
am: 9f90305051

Change-Id: Ief8c56b7e84531285ec356f93eef1b61e97fbf42