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