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: I47362a3132a8ca26da2d0fcb0d99eb8ef4cee187
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>