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

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

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