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

Change-Id: I41939b1dbc8351055bd167652bb7e9054cbb85b5