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 am: 05ff110c

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



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