Merge "qdmetadata: Add support for additional video cvp stats" into display-android-commonsys.lnx.1.1