Merge "Upgrade to hwcomposer 2.4" am: 9856b7763a am: b5ffcba4f4

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

Change-Id: Id88de633dc76a1f9a5d15eaf8d18642960aafc9a