[automerger skipped] Merge "Do not use hidden API UserManager#getPrimaryUser" am: 9f90305051 am: d43af0ddb4 am: 4a9a35f16b -s ours
am skip reason: Change-Id I1a59f78810d073d1782d8ad8498a36ea85428c09 with SHA-1 358d96ef52 is in history

Change-Id: I516b7fa1d6fa6e6d544aefe25aa11600241d5daf