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: 899ad19e

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



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