Merge "Replaced instances of toUpperCase() with uppercase() as the former is now deprecated and will cause errors when updating to future Kotlin releases." am: fbde51b84d am: 5050942c0d

Original change: https://android-review.googlesource.com/c/platform/packages/apps/DeskClock/+/2153313

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