Merge "Add support to configure double line clock in lockscreen [1/2]" into...

Merge "Add support to configure double line clock in lockscreen [1/2]" into main am: 90693766 am: 3ed530e2 am: 095d79fa

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



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