Merge "Keep clock below other UI elements" into tm-qpr-dev am: 6117424f

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



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