Merge "Do not use hidden APIs in UserHandle/UserManager"
am: b47a1305b6

Change-Id: Iea6ef2e996bb103ae256ea5e0175004c4b6d79af