[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: b32ca8fa74  -s ours am: 81f274ebb2  -s ours skipped: 1cdd92daaa skipped: 7a92b9afdb skipped: 849e67fad2 am: d2e50eb968 am: 66ef84dac4 am: 089012397b  -s ours
am: 6c3717661f

Change-Id: I07f340879620b0172166a96b4ab9b5d183867b2c
tree: 80ca5489f3519d96804a56addbea9ee72ff5ec88
  1. tests/