Merge RP1A.200204.001

Change-Id: I559ffb80a1b95e90252d0380e066958f13268bdf
diff --git a/testing/xts/src/com/android/timezone/xts/TimeZoneUpdateHostTest.java b/testing/xts/src/com/android/timezone/xts/TimeZoneUpdateHostTest.java
index 0170d80..6cd63a9 100644
--- a/testing/xts/src/com/android/timezone/xts/TimeZoneUpdateHostTest.java
+++ b/testing/xts/src/com/android/timezone/xts/TimeZoneUpdateHostTest.java
@@ -282,7 +282,7 @@
     }
 
     private void assertActiveRulesVersion(String expectedRulesVersion) throws Exception {
-        // Dumpsys reports the version reported by ICU, ZoneInfoDB and TimeZoneFinder and they
+        // Dumpsys reports the version reported by ICU, ZoneInfoDb and TimeZoneFinder and they
         // should always match.
         String expectedActiveRulesVersion =
                 expectedRulesVersion + "," + expectedRulesVersion + "," + expectedRulesVersion;