Respect Client Properties when reporting CDM Status

[ Merge from go/wvgerrit/14286 ]

CDM now reports status information associated with the specified security level.
Earlier information would be reported from the default security level.

b/18709693

Change-Id: I7a01e8ea9773b56951c207437ce85e567fd32b09

libwvdrmengine/mediadrm/include/WVDrmPlugin.h

@@ -254,7 +254,11 @@ class WVDrmPlugin : public android::DrmPlugin,
   map<CdmSessionId, CryptoSession> mCryptoSessions;
 
   status_t queryProperty(const std::string& property,
-                         std::string& string_value) const;
+                         std::string& stringValue) const;
+
+  status_t queryProperty(wvcdm::SecurityLevel securityLevel,
+                         const std::string& property,
+                         std::string& stringValue) const;
 
   status_t queryProperty(const std::string& property,
                          String8& string8_value) const;