Merge "Disable ClockOptionsProvider so clocks don't appear in picker app" into qt-dev
am: 386f09235d

Change-Id: I30eea455326096557e6fcce98a29daec2720ce9e