Merge "Do not use hidden API Build.IS_USER" am: 8e6c02984a am: a25af62290
am: f48fcd9a9c

Change-Id: Id75ff6d2928bfb72657dbbfea56b35a2e9da4129