[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: 5715c4b2 -s ours am: 0090060d -s ours

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

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



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