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

Change-Id: I554442be467ad618d02e5f8f3199d57c45d7b972