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

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



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