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