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

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



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