Source release 19.6.0

GitOrigin-RevId: 13a33e34413c19da1bfe76abcc66be519c9ac9d1

core/include/properties.h

@@ -75,6 +75,8 @@ class Properties {
   static bool GetProductName(std::string* product_name);
   static bool GetBuildInfo(std::string* build_info);
   static bool GetWVCdmVersion(std::string* version);
+  static bool GetPlatform(std::string* platform);
+  static bool GetFormFactor(std::string* form_factor);
   // Gets the base path for the device non-secure storage. Note that, depending
   // on the value of device_files_is_a_real_filesystem, this may or may not be
   // a real filesystem path.