[automerger skipped] Merge "Translate and Scale the status area with the large...

[automerger skipped] Merge "Translate and Scale the status area with the large weather clock" into udc-dev am: f0fa0677 am: d7a53fd1 -s ours am: b8f56792 -s ours

am skip reason: Merged-In I75378c6a2732f8486eef49b91a1c24caed002f1a with SHA-1 dcf8f5ae is already in history

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



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