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