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

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