[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715  -s ours am: afb3e84599  -s ours am: bafd18446f  -s ours
am: 72b96b0354  -s ours

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