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

Change-Id: Ib2db703ea02bfd8b9a689b0a17007764cc3ff6e2