Merge remote-tracking branch 'goog/mirror-aosp-master' into merge

The trout virtual device was broken by the recent move to HWC 2.4
as it was not able to execute the new calls in HWC 2.4; bring in
AOSP drm_hwc in order to support HWC 2.4 on trout

Bug: 202850907
Test: build and boot trout
Change-Id: I418234d51a8674ed348774a02f7b28ed6495e7ac