Merge "Don't check device_provisioned on Wear devices in setDeviceOwnerSystemPropertyLocked()" into cw-f-dev
am: 8a2ea2cf83

Change-Id: Ie25c9bfa82ccffc58b68c13b515d7f556d955289