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

Change-Id: I550b2c7ac5e3e5b07eda51c190c354e5236a561e