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