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

Change-Id: I4a591d5284b63280f9acc6f8cbdc2d06694b1545