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: b95bc37d am: 691b5f06

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



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