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

Merge "Add support to configure double line clock in lockscreen [2/2]" into main am: 3be411d5 am: 705507d6 am: 8d4d73f1 am: 9e233f32

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2539870



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