Merge changes from topic "am-6b57b7386ef246a589ff8148ff9eae8b" into oreo-cts-dev

* changes:
  Merge changes from topic "n1" into nougat-mr1-cts-dev am: 76faaa3996
  DO NOT MERGE Add CTS test for URI fix. am: 08044f045c  -s ours
tree: 59be354e010f9cf95aaa3d0cbbf9b1ff92fcacd6
  1. tests/