Merge "b/12068020 add nonce to InputDeviceDescriptor"