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

* commit '766164846662547d710e985f8c6e676c244bf894':
  Reset DateFormat.is24Hour after each test