Merge "If the current device is a watch, fix DeviceOwner/ProfileOwner logic." into cw-f-dev