[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 skipped: 8b6d971588 skipped: 63eae3a9e1 skipped: 1a158af55d am: 096c85e4cf
am: 591f6ccb9c

Change-Id: I352ea2e10daeaece58dd03f8e129d1d838f49366
tree: 75a10edf72cfba28d92b04107c06e95e30e16732
  1. tests/