Merge "Put in framework TimePicker to be backwards compatible for pre-L." into ub-deskclock-army