[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: 2653e180 am: ab4d655c -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ic1e9a0c4f2545a860464e02ea073ba6186a04bc0