Merge "Fix clock translation on lockscreen" into udc-dev am: 70ad8581

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



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