Merge changes from topic "am-0166235977bf44ffa6da136c3f46f686" into oreo-cts-dev

* changes:
  Merge changes from topic "am-4532af43002d481bba66a249d6a74576" into nougat-mr1-cts-dev am: f59fbfb5a4
  DO NOT MERGE Add CTS test for URI fix. am: 53a9c9bc34  -s ours am: 175d980772  -s ours
tree: 59be354e010f9cf95aaa3d0cbbf9b1ff92fcacd6
  1. tests/