Merge "Skip SOLID_COLOR layers from SF Caching" into tm-dev am: 47e41ac3 am:...

Merge "Skip SOLID_COLOR layers from SF Caching" into tm-dev am: 47e41ac3 am: 99edef4f am: 2d8c1d51

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



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