Merge "Remove usage of android.os.Build.IS_USER" am: 9ead9f02ce

Change-Id: I4b6c2001aa0ec30fa431cf473f09166e3e196b3c