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

Change-Id: I5db844c14a15125b24e9c06bd4e55288a15b6bdc