[automerger skipped] [DO NOT MERGE] Allow a settings override for double-line clock am: cb4836b486 am: d8ca5298ec -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: I0babc7ed0c88806d5763cb97af0fe43f4c43c59c
This commit is contained in: