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

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



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