Merge "Time for dark theme doesnt format 24 hr correctly" into rvc-d1-dev am:...

Merge "Time for dark theme doesnt format 24 hr correctly" into rvc-d1-dev am: e899f749 am: 01cb6c4a

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

Change-Id: I570f25117a12b55046dac45c086693e859e2cc6c