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

Change-Id: I839b678103da057bbe21dd03dc818a5758b714cb