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

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



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