[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: c1a7ce019c am: 7a3920dfa4 am: 6ae132c625  -s ours
am: 99a753312a

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