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

Change-Id: If0ae1447b1931c498134f16ecf4bd51efa83b9e0