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

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

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