Merge "Switch widgets away from android.text.format.Time" am: db31e6d0 am: 8d96e179 am: 19d4f4eb am: cc838856 Change-Id: I65dbe328322adc5b17b93de7bb1ceb095e576582