Merge "Use fixed height for small clock view position large clock" into...

Merge "Use fixed height for small clock view position large clock" into udc-dev am: e798caa7 am: 4b86383e

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



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