am d4cf5c55: am c776bbb1: Merge "Revert "Revert "Set 24 hour pref. with ACTION_TIME_CHANGED."""

* commit 'd4cf5c5578844ce9915aba178094313a9eeb8022':
  Revert "Revert "Set 24 hour pref. with ACTION_TIME_CHANGED.""