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

Change-Id: I65dbe328322adc5b17b93de7bb1ceb095e576582