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 am: b591008bc2  -s ours" into oc-mr1-dev
am: 9d36da58e7  -s ours

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