[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
Change-Id: I33e6cd995c4dd44e5f2a2da606301b6a094c2c54
This commit is contained in: