Merge "Skip SOLID_COLOR layers from SF Caching" into tm-dev am: 47e41ac3c1 am: 93663f3cf3

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

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