Merge "Make timezone changes apply to status bar time in 24hr mode. Bug: 2632681" into froyo