libwvdrmengine: Add custom CDM properties for ARCVM

We need to have extra properties we can check for this so they don't
conflict with the main ones for ro.product.{manufacturer|make|device}.

Bug: 197771575
Test: None

Change-Id: I63d57d59f3473beaa825b9f20e711f15d6280461
(cherry picked from commit 0f000ac305528059fc6ebdf4a3c82dd698ef4161)
(cherry picked from commit f46a1b9adcdaa103c394a2017a58e0ab6a6a4c77)

libwvdrmengine/cdm/src/properties_android.cpp

@@ -60,6 +60,8 @@ bool Properties::GetCompanyName(std::string* company_name) {
     LOGW("Properties::GetCompanyName: Invalid parameter");
     return false;
   }
+  if (GetAndroidProperty("ro.product.cdm.manufacturer", company_name))
+    return true;
   return GetAndroidProperty("ro.product.manufacturer", company_name);
 }
 
@@ -68,6 +70,8 @@ bool Properties::GetModelName(std::string* model_name) {
     LOGW("Properties::GetModelName: Invalid parameter");
     return false;
   }
+  if (GetAndroidProperty("ro.product.cdm.model", model_name))
+    return true;
   return GetAndroidProperty("ro.product.model", model_name);
 }
 
@@ -88,6 +92,8 @@ bool Properties::GetDeviceName(std::string* device_name) {
     LOGW("Properties::GetDeviceName: Invalid parameter");
     return false;
   }
+  if (GetAndroidProperty("ro.product.cdm.device", device_name))
+    return true;
   return GetAndroidProperty("ro.product.device", device_name);
 }