Reland "[Payments][Metrics] Extend expiry for ever-green metrics."

This is a reland of dc61429b
after infra team fixed the incremental build issue: crbug/1133102

Original change's description:
> [Payments][Metrics] Extend expiry for ever-green metrics.
>
> Also updated ownership.
>
> Bug: 1128111
> Change-Id: Iba6ba54d4a47e02579faa69ff7078ba6ab012333
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2426977
> Commit-Queue: Danyao Wang <danyao@chromium.org>
> Reviewed-by: Mark Pearson <mpearson@chromium.org>
> Reviewed-by: Hiroki Nakagawa <nhiroki@chromium.org>
> Reviewed-by: Sahel Sharify <sahel@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#811232}

Bug: 1128111
Change-Id: I7c00c0cc30538381cda80e2dfb98148b944d6481
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2446891
Commit-Queue: Danyao Wang <danyao@chromium.org>
Reviewed-by: Danyao Wang <danyao@chromium.org>
Reviewed-by: Mark Pearson <mpearson@chromium.org>
Cr-Commit-Position: refs/heads/master@{#813790}

tools/metrics/histograms/histograms_xml/payment/histograms.xml

@@ -22,7 +22,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histograms>
 
 <histogram name="PaymentRequest.CheckoutFunnel"
-    enum="PaymentRequestCheckoutFunnelSteps" expires_after="M90">
+    enum="PaymentRequestCheckoutFunnelSteps" expires_after="2021-08-01">
   <owner>danyao@chromium.org</owner>
   <owner>web-payments-team@google.com</owner>
   <summary>
@@ -35,14 +35,14 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PaymentRequest.CheckoutFunnel.Aborted"
-    enum="PaymentRequestAbortReason" expires_after="M85">
+    enum="PaymentRequestAbortReason" expires_after="2021-08-01">
   <owner>danyao@chromium.org</owner>
   <owner>web-payments-team@google.com</owner>
   <summary>The reason that lead to an abort of the Payment Request.</summary>
 </histogram>
 
 <histogram name="PaymentRequest.CheckoutFunnel.NoShow"
-    enum="PaymentRequestNoShowReason" expires_after="2020-05-24">
+    enum="PaymentRequestNoShowReason" expires_after="2021-08-01">
   <owner>danyao@chromium.org</owner>
   <owner>web-payments-team@google.com</owner>
   <summary>
@@ -51,7 +51,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PaymentRequest.Events" units="bitfield value"
-    expires_after="2021-01-31">
+    expires_after="2021-08-01">
   <owner>danyao@chromium.org</owner>
   <owner>web-payments-team@google.com</owner>
   <summary>
@@ -61,8 +61,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PaymentRequest.JourneyLoggerHasRecorded" enum="Boolean"
-    expires_after="2021-01-31">
-  <owner>sahel@chromium.org</owner>
+    expires_after="2021-08-01">
+  <owner>danyao@chromium.org</owner>
   <owner>web-payments-team@google.com</owner>
   <summary>
     Whether a journey logger has recorded an events bit field or not.
@@ -70,8 +70,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PaymentRequest.JourneyLoggerHasRecordedMultipleTimes"
-    enum="Boolean" expires_after="M85">
-  <owner>sahel@chromium.org</owner>
+    enum="Boolean" expires_after="2021-08-01">
+  <owner>danyao@chromium.org</owner>
   <owner>web-payments-team@google.com</owner>
   <summary>
     When a journey logger attempts to record multiple events bit fields.
@@ -79,8 +79,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PaymentRequest.MissingContactFields"
-    enum="PaymentRequestMissingContactFields" expires_after="2021-03-01">
-  <owner>sahel@chromium.org</owner>
+    enum="PaymentRequestMissingContactFields" expires_after="2021-08-01">
+  <owner>danyao@chromium.org</owner>
   <owner>web-payments-team@google.com</owner>
   <summary>
     A bitfield representing different missing fields of the contact section in
@@ -92,8 +92,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PaymentRequest.MissingPaymentFields"
-    enum="PaymentRequestMissingPaymentFields" expires_after="2021-03-01">
-  <owner>sahel@chromium.org</owner>
+    enum="PaymentRequestMissingPaymentFields" expires_after="2021-08-01">
+  <owner>danyao@chromium.org</owner>
   <owner>web-payments-team@google.com</owner>
   <summary>
     A bitfield representing different missing fields of the payment info section
@@ -105,8 +105,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PaymentRequest.MissingShippingFields"
-    enum="PaymentRequestMissingShippingFields" expires_after="2021-03-01">
-  <owner>sahel@chromium.org</owner>
+    enum="PaymentRequestMissingShippingFields" expires_after="2021-08-01">
+  <owner>danyao@chromium.org</owner>
   <owner>web-payments-team@google.com</owner>
   <summary>
     A bitfield representing different missing fields of the shipping section in
@@ -118,7 +118,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PaymentRequest.NumberOfSuggestionsShown" units="units"
-    expires_after="2021-01-24">
+    expires_after="2021-08-01">
   <owner>danyao@chromium.org</owner>
   <owner>web-payments-team@google.com</owner>
   <summary>
@@ -127,8 +127,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PaymentRequest.RefetchIconForInstalledApp" enum="Boolean"
-    expires_after="2021-06-24">
-  <owner>sahel@chromium.org</owner>
+    expires_after="2021-08-01">
+  <owner>danyao@chromium.org</owner>
   <owner>web-payments-team@google.com</owner>
   <summary>
     True when chrome crawls to refetch the missing icon of an already installed
@@ -138,7 +138,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="PaymentRequest.SecurePaymentConfirmationCredentialIdSizeInBytes"
-    units="bytes" expires_after="M93">
+    units="bytes" expires_after="2021-08-01">
   <owner>danyao@chromium.org</owner>
   <owner>web-payments-team@google.com</owner>
   <summary>
@@ -148,15 +148,15 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PaymentRequest.ServiceWorkerStatusCodeTimeout" enum="Boolean"
-    expires_after="2021-05-24">
-  <owner>sahel@chromium.org</owner>
+    expires_after="2021-08-01">
+  <owner>danyao@chromium.org</owner>
   <owner>web-payments-team@google.com</owner>
   <summary>True when a service worker times out 5 mins after request.</summary>
 </histogram>
 
 <histogram name="PaymentRequest.TimeToCheckout.Completed" units="ms"
-    expires_after="2021-01-31">
-  <owner>sahel@chromium.org</owner>
+    expires_after="2021-08-01">
+  <owner>danyao@chromium.org</owner>
   <owner>web-payments-team@google.com</owner>
   <summary>
     Records the time between a payment request .show() and its completion.
@@ -164,10 +164,10 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PaymentRequest.TimeToCheckout.Completed.Shown" units="ms"
-    expires_after="2021-01-31">
+    expires_after="2021-08-01">
 <!-- Name completed by histogram_suffixes name="PaymentRequestCompletedInstrument" -->
 
-  <owner>sahel@chromium.org</owner>
+  <owner>danyao@chromium.org</owner>
   <owner>web-payments-team@google.com</owner>
   <summary>
     Records the time between a payment request .show() and its completion when
@@ -176,10 +176,10 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PaymentRequest.TimeToCheckout.Completed.SkippedShow"
-    units="ms" expires_after="2021-01-31">
+    units="ms" expires_after="2021-08-01">
 <!-- Name completed by histogram_suffixes name="PaymentRequestCompletedInstrument" -->
 
-  <owner>sahel@chromium.org</owner>
+  <owner>danyao@chromium.org</owner>
   <owner>web-payments-team@google.com</owner>
   <summary>
     Records the time between a payment request .show() and its completion when
@@ -188,8 +188,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PaymentRequest.TimeToCheckout.OtherAborted" units="ms"
-    expires_after="2021-01-31">
-  <owner>sahel@chromium.org</owner>
+    expires_after="2021-08-01">
+  <owner>danyao@chromium.org</owner>
   <owner>web-payments-team@google.com</owner>
   <summary>
     Records the time between a payment request .show() and its termination by
@@ -198,10 +198,10 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PaymentRequest.TimeToCheckout.UserAborted" units="ms"
-    expires_after="2021-01-31">
+    expires_after="2021-08-01">
 <!-- Name completed by histogram_suffixes name="PaymentRequestPaymentSheetShowStatus" -->
 
-  <owner>sahel@chromium.org</owner>
+  <owner>danyao@chromium.org</owner>
   <owner>web-payments-team@google.com</owner>
   <summary>
     Records the time between a payment request .show() and its termination by
@@ -210,8 +210,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PaymentRequest.TransactionAmount.Completed"
-    enum="PaymentRequestTransactionSize" expires_after="2021-01-24">
-  <owner>sahel@chromium.org</owner>
+    enum="PaymentRequestTransactionSize" expires_after="2021-08-01">
+  <owner>danyao@chromium.org</owner>
   <owner>web-payments-team@google.com</owner>
   <summary>
     Records the transaction amounts completed using payment request API after
@@ -220,8 +220,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PaymentRequest.TransactionAmount.Triggered"
-    enum="PaymentRequestTransactionSize" expires_after="2021-01-31">
-  <owner>sahel@chromium.org</owner>
+    enum="PaymentRequestTransactionSize" expires_after="2021-08-01">
+  <owner>danyao@chromium.org</owner>
   <owner>web-payments-team@google.com</owner>
   <summary>
     Records the transaction amounts triggered using payment request API after

tools/metrics/histograms/histograms_xml/service/histograms.xml

@@ -22,8 +22,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histograms>
 
 <histogram name="ServiceWorker.AbortPaymentEvent.Time" units="ms"
-    expires_after="M85">
-  <owner>nhiroki@chromium.org</owner>
+    expires_after="2021-08-01">
+  <owner>danyao@chromium.org</owner>
+  <owner>web-payments-team@google.com</owner>
   <owner>jinho.bang@samsung.com</owner>
   <summary>
     The time taken between dispatching an AbortPaymentEvent to a Service Worker
@@ -169,8 +170,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ServiceWorker.CanMakePaymentEvent.Time" units="ms"
-    expires_after="2020-04-19">
-  <owner>nhiroki@chromium.org</owner>
+    expires_after="2021-08-01">
+  <owner>danyao@chromium.org</owner>
+  <owner>web-payments-team@google.com</owner>
   <owner>jinho.bang@samsung.com</owner>
   <summary>
     The time taken between dispatching an CanMakePaymentEvent to a Service
@@ -661,8 +663,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ServiceWorker.PaymentRequestEvent.Time" units="ms"
-    expires_after="M81">
-  <owner>nhiroki@chromium.org</owner>
+    expires_after="2021-08-01">
+  <owner>danyao@chromium.org</owner>
+  <owner>web-payments-team@google.com</owner>
   <owner>jinho.bang@samsung.com</owner>
   <summary>
     The time taken between dispatching an PaymentRequestEvent to a Service