Merge changes from topic "am-4a80c23f3c6c420e98f1331a523bf986"

* changes:
  Merge changes from topic "am-26881935e2b34994a556637dd980465e" into oreo-mr1-cts-dev am: 36407c961d
  DO NOT MERGE Add CTS test for URI fix. am: 08044f045c  -s ours am: 7955a4e8d8  -s ours am: d89f75a3db  -s ours
tree: e853df38a4cfac445da5c8c09439d780ca49595b
  1. tests/