Merge "Support SOLID_COLOR composition in GuestFrameComposer" am: a49dc0abb9

Original change: https://android-review.googlesource.com/c/device/generic/goldfish-opengl/+/2482638

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