Merge "Remove CommonClock / CommonTimeManagementService"
am: 72072cd769

Change-Id: I3146a6da8f3fbecc19b344b077e43b5d3e734041