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

Change-Id: Ie4d139a1eb1c5fc6506bb79861ffe81fed7c0157
tree: 03469773cb3dcf9de1579375494751bb24de1a91
  1. tests/