Merge "[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 am: 72b96b0354  -s ours" into oc-dev am: 68dc050239 am: 6edfe17ca2
am: c8b558b08f  -s ours

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