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

Merge "Revert "Fix clock translation on lockscreen"" into udc-dev am: bc3dfe94 am: ed54a9e3 am: d088cbdf am: 6b6ccf98

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



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