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 udc-qpr-dev-plus-aosp am: f6ed5785

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



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