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: 5f44b7cf am: 6430a4b8

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

Change-Id: Iac01c66216d6ab98654b97f33505d9f60714c78e