Merge "Switch else case to null in when expression to make it exhaustive" am: 83026726de am: ea9e108e4e

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2200210

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