Merge "Add support to configure double line clock in lockscreen [1/2]" into udc-qpr-dev-plus-aosp