[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715  -s ours am: afb3e84599  -s ours skipped: 868997117d skipped: a4cf60e6ea skipped: 8b6d971588 skipped: 63eae3a9e1 skipped: 1a158af55d am: 096c85e4cf am: 591f6ccb9c
am: bff76d3a93  -s ours

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