[automerger skipped] Merge "[DO NOT MERGE] Allow a settings override for...

[automerger skipped] Merge "[DO NOT MERGE] Allow a settings override for double-line clock" into sc-v2-dev am: b13b2fd8 am: 6274ca81 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ieede0d8433136aac3c6585c9b060d60264e9b2b5