Merge "Fix clock translation on lockscreen" into udc-dev am: cf3cbe8a0b am: 2527164d19

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

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