Merge "[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 8a0f955e56  -s ours am: 8dd2d10a1b  -s ours" into oc-dev
tree: 60d198c6bc42d67433853e97c225e2af7a0ad4bc
  1. tests/