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