Merge "[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: b32ca8fa74  -s ours am: 81f274ebb2  -s ours am: 308f60a04c  -s ours am: 3ace7af527  -s ours" into oc-mr1-dev
am: f893a5ace2  -s ours

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