Merge changes from topic "am-df79034a46694ff0b7e47fa7f8bf9120" into oreo-cts-dev

* changes:
  Merge changes from topic "am-ce0b82716046454cb0a4f10e2fc1d036" into nougat-mr1-cts-dev am: 5962c9a234
  DO NOT MERGE Add CTS test for URI fix. am: 36c5e0d87f  -s ours am: 181a10e364  -s ours am: 84a9da7ac9  -s ours am: 9dc912e515  -s ours
tree: d500dfe3f2212b65980908fff277cafcebb733ea
  1. tests/