Cherry pick 18.4 changes to udc-widevine-dev

Get the udc-widevine-dev Android branch and oemcrypto-v18 cdm branch in
sync. The commit ID for 18.4 on oemcrypto-v18 is
a2f23a2281e5e06dc2867585bdc516fa132b6396.

Merged from go/wvgerrit/190151

Bug: 290252845
Test: WVTS tests are running and passing
Change-Id: I457332e7ca70a5b5169345e1279b3eb9f18413b6

libwvdrmengine/cdm/include/properties_ce.h

@@ -0,0 +1,35 @@
+// Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary
+// source code may only be used and distributed under the Widevine License
+// Agreement.
+#ifndef WVCDM_CDM_PROPERTIES_CE_H_
+#define WVCDM_CDM_PROPERTIES_CE_H_
+
+#include "cdm.h"
+
+#if defined(UNIT_TEST)
+#  include <gtest/gtest.h>
+#endif
+
+namespace widevine {
+
+class PropertiesCE {
+ public:
+  static Cdm::SecureOutputType GetSecureOutputType();
+  static void SetProvisioningMessagesAreBinary(bool bin_prov);
+  // If this is set to an empty string, (which is the default) then PropertiesCE
+  // will report that there is no Sandbox ID in use.
+  static void SetSandboxId(const std::string& sandbox_id);
+  static bool ClientInfoIsValid();
+
+ private:
+  static void SetSecureOutputType(Cdm::SecureOutputType secure_output_type);
+
+  friend class Cdm;
+#if defined(UNIT_TEST)
+  FRIEND_TEST(CdmTest, DeviceCertificateRequest);
+#endif
+};
+
+}  // namespace widevine
+
+#endif  // WVCDM_CDM_PROPERTIES_CE_H_