[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715  -s ours skipped: 151750d842 skipped: d1811f0384 skipped: bbfa5d23a9 skipped: c407f8968b skipped: 6fc9eb97c5 skipped: 973a5cd865 skipped: cd9a559fd2 skipped: 853c5 skipped: c26ea26d31 am: 4d4f3950b6 am: 06c461a30b
am: 205a892ff5  -s ours

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