Reland of "Convert Widevine and Android platform key systems to KeySystemProperties" with fix

android_webview/renderer/aw_key_systems.h

Index: android_webview/renderer/aw_key_systems.h
diff --git a/android_webview/renderer/aw_key_systems.h b/android_webview/renderer/aw_key_systems.h
index 4bed8b61a3e4ac509e63f20445f136cd26d10161..ea15f325c481c4f36101415daa0d3ff997188bd1 100644
--- a/android_webview/renderer/aw_key_systems.h
+++ b/android_webview/renderer/aw_key_systems.h
@@ -5,13 +5,15 @@
 #ifndef ANDROID_WEBVIEW_RENDERER_AW_KEY_SYSTEMS_H_
 #define ANDROID_WEBVIEW_RENDERER_AW_KEY_SYSTEMS_H_
 
+#include <memory>
 #include <vector>
 
-#include "media/base/key_system_info.h"
+#include "media/base/key_system_properties.h"
 
 namespace android_webview {
 
-void AwAddKeySystems(std::vector<media::KeySystemInfo>* key_systems_info);
+void AwAddKeySystems(std::vector<std::unique_ptr<media::KeySystemProperties>>*
+                         key_systems_properties);
 
 }  // namespace android_webview