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

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

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

Change-Id: Ia582337584b46b14aa368514a6db6b11846026de