Merge "Update clock top margin" into tm-dev am: ec1e2907 am: 0686c9c2 am:...

Merge "Update clock top margin" into tm-dev am: ec1e2907 am: 0686c9c2 am: b49c9a5f am: d8749759

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



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