Merge "Null-check the desaturating view, it might be gone." into rvc-dev am:...

Merge "Null-check the desaturating view, it might be gone." into rvc-dev am: b19c92dc am: b40378b0

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

Change-Id: If1bd9b62aca9ec3202d76695e23f3679bc74981c