am 7f1c81b7: Merge "Revert "Set 24 hour pref. with ACTION_TIME_CHANGED.""

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