Merge changes from topic "am-dd7b05d27e59420687cc02c82e51669b"

* changes:
  Merge changes from topic "am-19d0b20ea6e84d16b2530475ea505475" into oreo-mr1-cts-dev am: d1f18aeba3
  DO NOT MERGE Add CTS test for URI fix. am: a02bbf31c4  -s ours am: 50ec90be8d  -s ours
tree: b64a77eba9658c782f258e9b28cc11ef423fc769
  1. tests/