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

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