Merge changes from topic "asb-2018-04-n" into nougat-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: e3c17fcbbce93239c7a396489a0984956f82c05e
  1. tests/