[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: b32ca8fa74  -s ours am: 81f274ebb2  -s ours am: 308f60a04c  -s ours
am: 3ace7af527  -s ours

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