Merge "Clear DISALLOW_ADD_USER in clearDeviceOwner for all cases"