[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: ae91a6ad6f -s ours am: 26d4c1f151 -s ours am: 00eb32582d -s ours
am: af5b3958ae -s ours Change-Id: I9850b877597ce963d9bff29641673ae1333c8482
This commit is contained in: