Merge "Handle no-op composition" am: 1b10abf3c9

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

Change-Id: I726cfcb51400842824d9326eaf8e509d74190231