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

Change-Id: I32d61ceb0610ed88bfeb574624e6df0a655bd458
tree: 27e41297f76178db974e7276857788fa47261bc6
  1. tests/