If the current device is a watch, fix DeviceOwner/ProfileOwner logic.
am: 34fb70ab88

Change-Id: I901764f7bba26c921896d94444799185cce41932