Merge changes from topic "am-157f76c7fc0b4412b75bfe4f38cb6b0f" into nougat-cts-dev

* changes:
  Merge changes from topic "asb-2018-04-m" into marshmallow-cts-dev am: 7f0c5e7da8
  [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715  -s ours
tree: e3c17fcbbce93239c7a396489a0984956f82c05e
  1. tests/