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

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



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