[automerger skipped] Merge "Creating a flag to enable low light clock...

[automerger skipped] Merge "Creating a flag to enable low light clock undocked" into tm-qpr-dev am: a43f32d5 am: ab8e986f -s ours am: cd48412b -s ours

am skip reason: Merged-In I191478b02c9baf9fce0acce6289a6cec65571488 with SHA-1 5cbed3dd is already in history

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



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