Store key set ID with usage info

[ Merge of http://go/wvgerrit/16241 and http://go/wvgerrit/16364 ]

This will allow a usage session to be loaded later by key set ID.
This is needed for EME-style secure stop in the new CE CDM API.

b/25816911

Change-Id: I916340047492fbc0556d0e90bd2eac0f3eafe597

libwvdrmengine/include/mapErrors-inl.h

@@ -347,6 +347,14 @@ static android::status_t mapCdmResponseType(wvcdm::CdmResponseType res) {
       return kOfflineLicenseProhibited;
     case wvcdm::STORAGE_PROHIBITED:
       return kStorageProhibited;
+    case wvcdm::EMPTY_KEYSET_ID_ENG_5:
+      return kEmptyKeySetIdEng5;
+    case wvcdm::SESSION_NOT_FOUND_11:
+      return kSessionNotFound11;
+    case wvcdm::LOAD_USAGE_INFO_FILE_ERROR:
+      return kLoadUsageInfoFileError;
+    case wvcdm::LOAD_USAGE_INFO_MISSING:
+      return kLoadUsageInfoMissing;
     case wvcdm::UNKNOWN_ERROR:
       return android::ERROR_DRM_UNKNOWN;
     case wvcdm::SECURE_BUFFER_REQUIRED: