Merge "Merge "Added assertion message to testDns failures" into lollipop-mr1-cts-dev am: 350b2aa" into marshmallow-cts-dev
am: 936375b

* commit '936375b6f25a328a06d5b783f6fde63afb13d681':
  Added assertion message to testDns failures

Change-Id: I9a56dfe2d0960898b61f26ccee3607c7558034de