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: I66b7b5fb709fd1f5d2de40e7bd14a01c3c41aaa6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>