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

Change-Id: Ibf15871a6d0ca3219ebf32de89a42c9d680c427a