Merge "Fix createConfirmDeviceCredentialIntent for wear for CTS." into cw-f-dev am: f9154e923b am: de098d013c
am: f8ab89c514

Change-Id: I7fa6629d5264ed7c96cced3355f900b9b2b99919