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