Merge "Add Flag for Custom Clocks" into tm-qpr-dev am: 79dac2d2

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



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