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

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

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