[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454
am: ae91a6ad6f  -s ours

Change-Id: I07f5461359c0b0d810d90c8a208c2c9fa00e1413