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

Change-Id: Idba3ff7e8d9762f410b9da4a86b1a346791805c1