DO NOT MERGE Fix disabling DO single user features when clearDeviceOwner() is called am: 5c64223da4
am: a507f28143  -s ours

Change-Id: I8f0c4a62e3e4dcd2c9c6d4e59365e466e96da6ed