[automerger skipped] VT: Fixed an issue that CVO can not be parsed. am:...

[automerger skipped] VT: Fixed an issue that CVO can not be parsed. am: 7bf2734a am: bac2de1c am: 280b9cd7 -s ours am: 4dd925ab -s ours

am skip reason: Change-Id I1ae58c7f4edab108eb0f24836d80c0ae23665137 with SHA-1 0675e565 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1591119

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ief367e8e053a21c9ea566a2411463d31106af509