Merge changes from topic "am-4267ce935a9849bdbcbcc7e45cbacd34" into oreo-cts-dev

* changes:
  Merge changes from topic "am-c7faa8cb80994bb993d5bdac6eca009c" into nougat-mr1-cts-dev am: 36b9badd7a
  [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: b32ca8fa74  -s ours am: 81f274ebb2  -s ours
tree: 27e41297f76178db974e7276857788fa47261bc6
  1. tests/