Add Flag for Custom Clocks

Test: Manual
Bug: 229771520
Change-Id: Ic06481b3da589ab6f27ae4ff79bd39a45dee3711
Merged-In: Ic06481b3da589ab6f27ae4ff79bd39a45dee3711
5 files changed