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

* changes:
  Merge changes from topic "am-c4615261ef624ee49e66b0c52ff3f69c" into nougat-mr1-cts-dev am: 8ef12d94da
  [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715  -s ours am: afb3e84599  -s ours am: bafd18446f  -s ours
tree: 27e41297f76178db974e7276857788fa47261bc6
  1. tests/