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

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

Change-Id: I243c8725d48e167e32785ab08ce40864588f1746