Revert "Track DeskClock, Track Bluetooth"

This reverts commit 5e22882fc744265e7ac4f6d7b3f7c9a0c86f1359.

Change-Id: Ie5725d8063fe5c3c7ea91e0c99ed904d51e1fa32