[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: ac5b691121  -s ours
am: 2a60c1ea48  -s ours

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