Merge "Fix clock showing 12 hour format when 24 hour format is chosen" into udc-dev am: 53aeae186f

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

Change-Id: I8d882974853c3b70b3bc3ef202dc38e5c3b7f25b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>