Merge "Revert "Enable DemoMode for new QS clock"" into tm-qpr-dev am: 48d4a5d6 am: 74df9a27

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



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