Merge "Change time format for default clock in keyguard" into jb-mr2-dev