Merge "Fix Positioning of large custom clocks within frame" into tm-qpr-dev...

Merge "Fix Positioning of large custom clocks within frame" into tm-qpr-dev am: cd8590e5 am: 2b309bbc

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



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