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

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