[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: ae91a6ad6f -s ours am: 81c482bdd4 am: a208a33079 am: c8781cfae4 -s ours
am: 62874f71ec
Change-Id: I76ef90f114d393dc8fc1d3ad42139551d22592bd
This commit is contained in: