am 48570adf: Merge "Fix NPE in DateFormat.is24HourFormat." into klp-dev

* commit '48570adfd927ac1d3bb2a2671a5f54bba573155e':
  Fix NPE in DateFormat.is24HourFormat.