Merge "Merge "Add assertion messages to testSendMessages." into lollipop-mr1-cts-dev am: 38a22ce6d4" into marshmallow-cts-dev am: df74ec86ea am: 66a09c2e36 am: aff442b558 am: 765e4f5359 am: 2c6d4a636f
am: 1539dab350

* commit '1539dab350a5d11a54aecde2e9bd9eaae8e23adb':
  Add assertion messages to testSendMessages.

Change-Id: I4c29272e21176b1d95273ca695ea8f1d27546eff