Merge "Do not use hidden APIs in UserHandle/UserManager"