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

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



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