[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
am: b591008bc2  -s ours

Change-Id: Id2cd89dae283270d5a88a7c42b0f2cbdc311e9a6
tree: 4b52b3db297b78c2c6547af0730d92e6f6ef1987
  1. tests/