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

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