wvcdm: filter logs by app uid

This commit is a combination of the following:
* http://go/wvgerrit/117003
* http://go/wvgerrit/118303

Bug: 162255728
Test: MediaDrmTest#testGetLogMessages
Change-Id: I5699b64d5c4bab463e5b587595fa7d324dc1d93f

libwvdrmengine/mediadrm/include_hidl/WVDrmPlugin.h

@@ -11,6 +11,7 @@
 
 #include "cdm_client_property_set.h"
 #include "cdm_identifier.h"
+#include "log.h"
 #include "wv_cdm_event_listener.h"
 #include "wv_content_decryption_module.h"
 #include "OEMCryptoCENC.h"
@@ -264,6 +265,10 @@ struct WVDrmPlugin : public ::drm::V1_4::IDrmPlugin, IDrmPluginListener,
  private:
   WVDRM_DISALLOW_COPY_AND_ASSIGN_AND_NEW(WVDrmPlugin);
 
+  // List this field first so it is destructed last; ensure logging uid
+  // is cleared right before plugin is destructed.
+  wvcdm::LoggingUidSetter mLoggingUidSetter;
+
   struct CryptoSession {
    public:
     CryptoSession()
@@ -414,6 +419,8 @@ struct WVDrmPlugin : public ::drm::V1_4::IDrmPlugin, IDrmPluginListener,
     // until a call to getCdmIdentifier.
     bool is_sealed() { return mIsIdentifierSealed; }
 
+    uint32_t user_id() const { return mCdmIdentifier.user_id; }
+
    private:
     WVDRM_DISALLOW_COPY_AND_ASSIGN(CdmIdentifierBuilder);