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

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