Return failure if ignore keybox debug count is non-zero. am: 1b35b915b5 am: d2c1aec4a7

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/16496629

Change-Id: I541c6134f8c01612b9fb6b91f7217aad45d558e3

libwvdrmengine/cdm/core/src/oemcrypto_adapter_dynamic.cpp

@@ -2988,6 +2988,13 @@ extern "C" OEMCryptoResult OEMCrypto_ProcessOTAKeybox(OEMCrypto_SESSION session,
         LOGE("Installed OTA keybox. save ignore count failed %d, count=%u",
              static_cast<int>(save_result), ignore_count);
       }
+      if (ignore_count > 0 && result == OEMCrypto_SUCCESS) {
+        // If success is returned while the dynamic adapter continues
+        // to ignore the keybox, the CDM layer will enter an invalid
+        // state and apps may get stuck.
+        LOGD("Ignoring install success");
+        return OEMCrypto_ERROR_UNKNOWN_FAILURE;
+      }
     }
   }
   return result;