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/mediacrypto/include_hidl/WVCryptoPlugin.h

@@ -10,6 +10,7 @@
 #include <android/hidl/memory/1.0/IMemory.h>
 
 #include "HidlTypes.h"
+#include "log.h"
 #include "wv_content_decryption_module.h"
 #include "WVTypes.h"
 
@@ -24,7 +25,7 @@ using ::android::hidl::memory::V1_0::IMemory;
 struct WVCryptoPlugin : public ::drm::V1_4::ICryptoPlugin {
   WVCryptoPlugin(const void* data, size_t size,
                  const sp<wvcdm::WvContentDecryptionModule>& cdm);
-  virtual ~WVCryptoPlugin() {}
+  virtual ~WVCryptoPlugin();
 
   Return<bool> requiresSecureDecoderComponent(const hidl_string& mime)
       override;
@@ -67,10 +68,15 @@ struct WVCryptoPlugin : public ::drm::V1_4::ICryptoPlugin {
  private:
   WVDRM_DISALLOW_COPY_AND_ASSIGN_AND_NEW(WVCryptoPlugin);
 
+  // List this field first so it is destructed last; ensure logging uid
+  // is cleared right before plugin is destructed.
+  wvcdm::LoggingUidSetter mLoggingUidSetter;
+
   wvcdm::CdmSessionId mSessionId;
   std::map<uint32_t, sp<IMemory> > mSharedBufferMap;
 
   sp<wvcdm::WvContentDecryptionModule> const mCDM;
+  uint32_t mUserId;
 
   Status_V1_2 attemptDecrypt(
       const wvcdm::CdmDecryptionParametersV16& params,