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

Change-Id: Id298dfba4969b5b1555a557fee67bb0e0a91ea7c
tree: f3f0cc4dfc1fd0c32aee204964900997d22853ac
  1. tests/