Merge "Fix for: error: 'when' expression must be exhaustive, add necessary 'null' branch or 'else' branch instead" am: 754beffad4 am: b125fb0ce3

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

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