[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: Iaf42de1c60bf096cf31edbf0ed60586aa42b85d5
tree: 4b52b3db297b78c2c6547af0730d92e6f6ef1987
  1. tests/