Merge "Skip SOLID_COLOR layers from SF Caching" into tm-dev am: 47e41ac3c1 am: 99edef4fc4 am: 2d8c1d51c6 am: 5b94d0858d

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

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