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

Change-Id: Ia77e561eb2aabba4a29b81c09b55d251a3e6ece5