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: dc7451d0

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

Change-Id: I40cf1ecb0b784ad939dd7f2c399e52509ca049f1