Merge "[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: ae91a6ad6f  -s ours am: 26d4c1f151  -s ours" into oc-mr1-dev
am: 61b59aed96  -s ours

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