[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: 853c5 skipped: c26ea26d31
am: 4d4f3950b6

Change-Id: I04cf9cf4b0bb75e97c45ad4f2c3fe34b03281d75
tree: b200fff2914576bdb3d59836b60e90f4adb0b12b
  1. tests/