am 184c339d: am 2fe82585: am 76616484: Merge "Reset DateFormat.is24Hour after each test" into lollipop-mr1-cts-dev

* commit '184c339dcb0ec4fe31d3be6df1d694adbe9dc525':
  Reset DateFormat.is24Hour after each test