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

Change-Id: I9d60b68be04ed4f32a782ba09f406b2953f4938b
tree: e3c17fcbbce93239c7a396489a0984956f82c05e
  1. tests/