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

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