Merge "Revert "Set 24 hour pref. with ACTION_TIME_CHANGED.""