Merge "Skip SOLID_COLOR layers from SF Caching" into tm-dev am: 47e41ac3c1 am: 01e7634010 am: 67ce6100a2

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

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