Merge "Switch widgets away from android.text.format.Time" am: db31e6d07a am: 8d96e17940
am: 19d4f4eb32

Change-Id: I65336bde8f7730cb3aea8f436d5e301d808c52e6