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

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

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



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