Merge "Merge "If the current device is a watch, fix DeviceOwner/ProfileOwner logic." into cw-f-dev am: e50a485c am: d4ef6421 am: 52df5e2c"