[automerger skipped] Merge "Remove usage of android.os.Build.IS_USER" am: 9ead9f02ce am: d8d545d048 am: 63389badab -s ours
am skip reason: Change-Id I572736ff773e71e420a732aa4c56d5dceee1a454 with SHA-1 b30b3ba232 is in history

Change-Id: I6e9e7ad37b35b0be2d62b3603dc5e060541e305c