Update from https://crrev.com/306655

net/http/http_server_properties_manager.cc

Index: net/http/http_server_properties_manager.cc
diff --git a/net/http/http_server_properties_manager.cc b/net/http/http_server_properties_manager.cc
index 5773129aa7d685207cc9adccb2c853534c9012a5..62db0b4a26fe5d658a32704f12f30ba39d20c84f 100644
--- a/net/http/http_server_properties_manager.cc
+++ b/net/http/http_server_properties_manager.cc
@@ -27,13 +27,7 @@ const int64 kUpdateCacheDelayMs = 1000;
 // Time to wait before starting an update the preferences from the
 // http_server_properties_impl_ cache. Scheduling another update during this
 // period will reset the timer.
-// TODO(rtenneti): Remove OS_ANDROID ifdef after testing if flushing of
-// AlternateProtocolHosts to disk in 500ms helps with QUIC's 0RTT or not.
-#if defined(OS_ANDROID)
-const int64 kUpdatePrefsDelayMs = 500;
-#else
 const int64 kUpdatePrefsDelayMs = 5000;
-#endif
 
 // "version" 0 indicates, http_server_properties doesn't have "version"
 // property.