Merge "Revert "Fix clock translation on lockscreen"" into udc-dev am:...

Merge "Revert "Fix clock translation on lockscreen"" into udc-dev am: bc3dfe94 am: d0a1464c am: d6ef9d34 am: dc3b155a

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



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