Merge changes I09249afe,I713ff1c4 into sc-dev

* changes:
  Enable the CDM to track the DRM private key type.
  Report OEMCrypto's ECC capabilities.

libwvdrmengine/include_hidl/mapErrors-inl.h

@@ -358,6 +358,7 @@ static Status mapCdmResponseType_1_0(wvcdm::CdmResponseType res) {
     case wvcdm::LICENSE_USAGE_ENTRY_MISSING:
     case wvcdm::PROVISIONING_NOT_ALLOWED_FOR_ATSC:
     case wvcdm::NO_SRM_VERSION:
+    case wvcdm::CERT_PROVISIONING_RESPONSE_ERROR_9:
       ALOGW("Returns UNKNOWN error for legacy status: %d", res);
       return Status::ERROR_DRM_UNKNOWN;