Merge "Update clock format when locale list changes" into pi-dev
am: 74f5aa0237

Change-Id: I383d98760fd82c2119e733073f48a81366b5a741