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

Merge "Fix clock translation on lockscreen" into udc-dev am: 70ad8581 am: ebfc3fbd am: 78fd1cfb am: b878bcf1

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



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