Merge "Merge "Null-check the desaturating view, it might be gone." into...

Merge "Merge "Null-check the desaturating view, it might be gone." into rvc-dev am: b19c92dc am: b40378b0" into rvc-d1-dev-plus-aosp am: 562c2095 am: 720ea5ac

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

Change-Id: I04aad2798db1a67061b05f0950a08497e9040c3f