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

Merge "Fix clock translation on lockscreen" into udc-dev am: cf3cbe8a am: c64348e0 am: d76496c3 am: b5fdbd5d

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



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