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
tree: 75a10edf72cfba28d92b04107c06e95e30e16732
  1. tests/