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

Change-Id: If2172db10d7f7bf21aab21b3b921b212121c8c1c