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

Change-Id: I1b923cedfe59be1f33b4b0986742888a1101523e