VT: Fixed an issue that CVO can not be parsed. am: 7bf2734afc am: bac2de1c22

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I13bd35db8c08e73e25d2853bd6b40df1dd475fef