tree f3f0cc4dfc1fd0c32aee204964900997d22853ac
parent 5962c9a234713d63721da8efe1e0b38b9723bda2
parent 55c6004dfd0b36c3f9272db1fd7f0f69d68c1e2a
author Treehugger Robot <treehugger-gerrit@google.com> 1523312512 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1523312512 +0000

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