Extend expiry of SB2.*Local histograms to M81

And never expire InternalErrorStatusCode2 histograms since it is
critical to ensure that there are no errors in connecting to GmsCore
for Safe Browsing lookups.

R=holte

Bug: 986648
Change-Id: Iefc06682aa7c4e5bb55bf54330931fc51ad4d4d8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1719629
Commit-Queue: Varun Khaneja <vakh@chromium.org>
Commit-Queue: Steven Holte <holte@chromium.org>
Reviewed-by: Steven Holte <holte@chromium.org>
Auto-Submit: Varun Khaneja <vakh@chromium.org>
Cr-Commit-Position: refs/heads/master@{#681108}

tools/metrics/histograms/histograms.xml

@@ -115569,7 +115569,7 @@ parsed correctly. -->
 </histogram>
 
 <histogram name="SB2.RemoteCall.CanUseLocalBlacklists"
-    enum="SB2RemoteCallCanUseLocalBlacklists" expires_after="M77">
+    enum="SB2RemoteCallCanUseLocalBlacklists" expires_after="M81">
   <owner>vakh@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -115657,7 +115657,10 @@ parsed correctly. -->
 </histogram>
 
 <histogram name="SB2.RemoteCall.InternalErrorStatusCode2"
-    enum="GooglePlayServicesConnectionResult" expires_after="M77">
+    enum="GooglePlayServicesConnectionResult" expires_after="never">
+<!-- expires-never: This tracks the result of connecting to GmsCore for
+Safe Browsing lookups, which is critical for security. -->
+
   <owner>vakh@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -115670,7 +115673,7 @@ parsed correctly. -->
 </histogram>
 
 <histogram name="SB2.RemoteCall.LocalBlacklistsAgeInMs" units="ms"
-    expires_after="M77">
+    expires_after="M81">
   <owner>vakh@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -115693,7 +115696,7 @@ parsed correctly. -->
 </histogram>
 
 <histogram name="SB2.RemoteCall.LocalBlacklistsUpdateSucceeded"
-    enum="BooleanSuccess" expires_after="M77">
+    enum="BooleanSuccess" expires_after="M81">
   <owner>vakh@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>