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

Change-Id: I3b2cc560a4b664399a742d4301304dcf3e99f6ed