Changes to support new MediaDrm methods

[ Merge from http://go/wvgerrit/42602 ]

Renamed HDCP related query names to better reflect their purpose.

Bug: 69674645
Test: wv unit/integration tests
Change-Id: If4da45ff676da0e812852bf34f209d99e59c059b

libwvdrmengine/cdm/core/src/cdm_engine.cpp

@@ -1621,7 +1621,7 @@ std::string CdmEngine::MapHdcpVersion(
     CryptoSession::HdcpCapability version) {
   switch (version) {
     case HDCP_NONE:
-      return QUERY_VALUE_UNPROTECTED;
+      return QUERY_VALUE_HDCP_NONE;
     case HDCP_V1:
       return QUERY_VALUE_HDCP_V1;
     case HDCP_V2:
@@ -1631,9 +1631,10 @@ std::string CdmEngine::MapHdcpVersion(
     case HDCP_V2_2:
       return QUERY_VALUE_HDCP_V2_2;
     case HDCP_NO_DIGITAL_OUTPUT:
-      return QUERY_VALUE_DISCONNECTED;
+      return QUERY_VALUE_HDCP_NO_DIGITAL_OUTPUT;
+    default:
+      return QUERY_VALUE_HDCP_LEVEL_UNKNOWN;
   }
-  return "";
 }
 
 void CdmEngine::CloseExpiredReleaseSessions() {