Merge changes from topic "o" into oreo-cts-dev

* changes:
  DO NOT MERGE: Test for bug 69478425
  DO NOT MERGE: Add CTS test for bug 65483665