[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 8a0f955e56  -s ours skipped: d4d28bcb12 skipped: 948813147b skipped: 1cd8984784 am: 0c883452f2 am: aa7ce42421 am: 749e2c39a0  -s ours
am: 2001900f59

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