Merge "[DO NOT MERGE] Allow a settings override for double-line clock" into sc-v2-dev am: 2653e180

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

Change-Id: I136215247e2c046eef0b1893747b888cd40f0259