Merge "Merge "Clear DateFormat.is24Hour during test." into oreo-cts-dev am: 41b45edffa"