am de16e00f: Merge "TimePicker CTS test failing."

* commit 'de16e00f6d80b6ec21c15cfaba6f2083a5d4d86b':
  TimePicker CTS test failing.