[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: b32ca8fa74 -s ours am: 81f274ebb2 -s ours am: 308f60a04c -s ours
am: c1a7ce019c
Change-Id: If52d64e09d7b1570ed1f8b7e90e47b4e24f05956
This commit is contained in: