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

Change-Id: Ie2b42f537424e285ee8beae599510bf8e62e6b71