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

Change-Id: Ic32e80e3c05bed7890832c6d78eb559a22549006