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

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

Change-Id: I607edce1f3981b4b8882bea1530362980a280de9