Merge "Upgrade to hwcomposer 2.4" am: 9856b7763a

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

Change-Id: I59adb078b790bf89236a4b5772059cc62ee16c40