[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

Change-Id: I649d54fb86aae841b9b0e5dafb6493e6823c1561
tree: 75a10edf72cfba28d92b04107c06e95e30e16732
  1. tests/