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

Change-Id: If2935b3a343ee90d21992e50f2f6a3d8e698fa39
tree: f36d063dc47508a933d6f53648e46572d71fe611
  1. tests/