[automerger skipped] Merge "Add support to configure double line clock in...

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

am skip reason: Merged-In I35d5b2807befe253ba327690fdcbc39af3bcfb37 with SHA-1 41b8da97 is already in history

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



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