[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715  -s ours skipped: 151750d842 skipped: d1811f0384 skipped: bbfa5d23a9 skipped: c407f8968b skipped: 6fc9eb97c5 skipped: 973a5cd865 skipped: cd9a559fd2 skipped: f283bb8132

Change-Id: Ic604614e4f886489429b0fd86f4432613b0e31a4
tree: 3cfc405f22847ea44743da0c9a343404ecde7883
  1. tests/