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

Merge "Fix clock translation on lockscreen" into udc-dev am: cf3cbe8a am: 5540ed8d am: fbe5faab

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



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