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

android_webview/renderer/aw_content_renderer_client.h

Index: android_webview/renderer/aw_content_renderer_client.h
diff --git a/android_webview/renderer/aw_content_renderer_client.h b/android_webview/renderer/aw_content_renderer_client.h
index e3a963acdfcdae71bd69257b1aba90f05bdd0fba..913824200d38f6161e12649e88ba22cf8a550a52 100644
--- a/android_webview/renderer/aw_content_renderer_client.h
+++ b/android_webview/renderer/aw_content_renderer_client.h
@@ -36,7 +36,9 @@ class AwContentRendererClient : public content::ContentRendererClient {
   unsigned long long VisitedLinkHash(const char* canonical_url,
                                      size_t length) override;
   bool IsLinkVisited(unsigned long long link_hash) override;
-  void AddKeySystems(std::vector<media::KeySystemInfo>* key_systems) override;
+  void AddSupportedKeySystems(
+      std::vector<std::unique_ptr<::media::KeySystemProperties>>* key_systems)
+      override;
 
   bool HandleNavigation(content::RenderFrame* render_frame,
                         bool is_content_initiated,