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

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

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