Merge "invalidate if the colormode changes" into udc-qpr-dev am: c683ddd7

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



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