[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454
am: 8a0f955e56 -s ours Change-Id: I0024538a8e58264b11b0573881e8c2e30191b3b2
This commit is contained in:
am: 8a0f955e56 -s ours Change-Id: I0024538a8e58264b11b0573881e8c2e30191b3b2