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