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

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