[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454
am: 8a0f955e56  -s ours

Change-Id: Ib3da591114c4022fb94114f768d0ecf3f5c106b1
tree: d500dfe3f2212b65980908fff277cafcebb733ea
  1. tests/