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

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



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