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 am: 3e8a57ac9b am: 2ddf6c6ee9 am: 89e49e0f98

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

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