resolved conflicts for a0bc2e7e to lmp-mr1-dev

The original change wasn't properly merged into lmp-mr1-dev because of
merge conflicts. This change manually resolves the conflicts. The main
reason for the conflict was that TimePickerSpinnerDelegate was swapped
with TimePickerClockDelegate.

This change also fixes the typo in the original change which was fixed
in a subsequent change.

Original commit: 12b6d29b
fix for typo: cb09bc45

Change-Id: I50bf8c2d86318f632465a38adfad16d1382a9319