[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: b32ca8fa74 -s ours skipped: 2af33bcc3e skipped: e9ec3eb83b skipped: 49581046e4
Change-Id: I00a65994b1e7f5abddd95472da44f301b142ffbb
This commit is contained in: