[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: b32ca8fa74  -s ours am: 81f274ebb2  -s ours am: 308f60a04c  -s ours am: 3ace7af527  -s ours am: 2040949cb3  -s ours
am: 4aa69908c2  -s ours

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