Merge "Don't try to create user when on a single-user device." into oc-dev am: a8d86dac2f
am: d1888109e5

Change-Id: I2a237a05b32ffa1c2b88a805c1410edc68b06832