Revert "Create unique cdm engines per WVDrmPlugin instance"

This change introduced b/77618383, need to revert.

This reverts commit 58234a69f2.

Change-Id: Ie7d515bcd94f2dcee6fa9b885cd0441845c82c22

Bug: 77618383
(cherry picked from commit 90441e24df)

Change-Id: I114cb3cf5b69e2698d407ba4cf15cefcad2aaf3d

libwvdrmengine/mediadrm/include_hidl/WVDrmPlugin.h

@@ -365,10 +365,6 @@ struct WVDrmPlugin : public IDrmPlugin, IDrmPluginListener,
     const std::string& origin() const { return mCdmIdentifier.origin; }
     bool set_origin(const std::string& id);
 
-    // Indicates whether the builder can still be modified. This returns false
-    // until a call to getCdmIdentifier.
-    bool is_sealed() { return mIsIdentifierSealed; }
-
    private:
     WVDRM_DISALLOW_COPY_AND_ASSIGN(CdmIdentifierBuilder);
 
@@ -386,13 +382,6 @@ struct WVDrmPlugin : public IDrmPlugin, IDrmPluginListener,
     // outside this class should use getDeviceUniqueId() to get the
     // application-safe device-unique ID.
     Status getOemcryptoDeviceId(std::string* id);
-
-    // The unique identifier is meant to ensure that two clients with the
-    // same spoid, origin and app package name still get different cdm engine
-    // instances. This is a stepping stone to simplifying the implementation.
-    // Note that we do not have a lock or mutex around this object. We assume
-    // that locking is handled external to this object.
-    uint32_t getNextUniqueId();
   } mCdmIdentifierBuilder;
 
   sp<wvcdm::WvContentDecryptionModule> const mCDM;