Merge changes from topic "asb-2018-04-m" into marshmallow-cts-dev

* changes:
  DO NOT MERGE CTS for presence of avc fix for b/70897454
  DO NOT MERGE Add CTS test for URI fix.
  DO NOT MERGE CTS additions for b/72165027
  DO NOT MERGE CTS tests for b/70897394
tree: 03469773cb3dcf9de1579375494751bb24de1a91
  1. tests/