Merge "Merge "Adding KT Safety to NO_DELIVERY_REPORT" into lollipop-mr1-cts-dev am: 62a125eaa4" into marshmallow-cts-dev
am: e587386a12

* commit 'e587386a12844b2cfa24bd8e6888b8fdaf28fa9a':
  Adding KT Safety to NO_DELIVERY_REPORT

Change-Id: I4915e0196b0bcf34b8b2b8ee54594e1724b62d9d