Sheriff: Disable StorageModificationAfterPagehideHistogram

Looks like this wasn't disabled correctly the first time. Disabling for
real (and also added OS_ANDROID due to large number of flakes there).

Bug: 1156218
Change-Id: I2b308bf11505b1081ac9c3f88676bcc61e65fb38
Tbr: arthursonzogni@chromium.org
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2627716Reviewed-by: Arthur Sonzogni <arthursonzogni@chromium.org>
Commit-Queue: Adithya Srinivasan <adithyas@chromium.org>
Cr-Commit-Position: refs/heads/master@{#843591}

content/browser/renderer_host/render_frame_host_manager_browsertest.cc

@@ -7749,7 +7749,7 @@ IN_PROC_BROWSER_TEST_P(ProactivelySwapBrowsingInstancesSameSiteTest,
   }
 }
 
-#if defined(OS_CHROMEOS)
+#if defined(OS_CHROMEOS) || defined(OS_ANDROID)
 // Quite flaky: https://crbug.com/1156218
 #define MAYBE_StorageModificationAfterPagehideHistogram \
   DISABLED_StorageModificationAfterPagehideHistogram
@@ -7759,7 +7759,7 @@ IN_PROC_BROWSER_TEST_P(ProactivelySwapBrowsingInstancesSameSiteTest,
 #endif
 
 IN_PROC_BROWSER_TEST_P(ProactivelySwapBrowsingInstancesSameSiteTest,
-                       StorageModificationAfterPagehideHistogram) {
+                       MAYBE_StorageModificationAfterPagehideHistogram) {
   ASSERT_TRUE(embedded_test_server()->Start());
   GURL url_a1(embedded_test_server()->GetURL("a.com", "/title1.html"));
   GURL url_a2(embedded_test_server()->GetURL("a.com", "/title2.html"));