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

Change-Id: I497266b9a4805b356ebab6deca215020627cfd6e