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

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