Merge "Make solid color cache attempts use alpha" into sc-dev am: 4c44be8c

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

Change-Id: I4bdb0f241483021b5a2507a8a7b29b470646357c