Revert "Revert "Shamu: enable qcom time services""

This reverts commit 017502a6d83060a88dca3e466e282699511eefda.

Change-Id: I71ca25718d9b4681c3697cc41091be2943297bca
Merge "Revert "Revert "Shamu: enable qcom time services""" into lollipop