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

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



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