[automerger skipped] Merge "Add Flag for Custom Clocks" into tm-qpr-dev am:...

[automerger skipped] Merge "Add Flag for Custom Clocks" into tm-qpr-dev am: 79dac2d2 am: 9a751c16 -s ours

am skip reason: Merged-In Ic06481b3da589ab6f27ae4ff79bd39a45dee3711 with SHA-1 7c98605a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19492350



Change-Id: Ic8a871a0eccd18c7b52fd03decfe34fbb310d3e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>