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

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

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