Merge "Revert "Revert "Enable DemoMode for new QS clock""" into tm-qpr-dev am:...

Merge "Revert "Revert "Enable DemoMode for new QS clock""" into tm-qpr-dev am: 1f0592c9 am: ba1ef450

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



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