Merge remote-tracking branch 'goog/mirror-aosp-master' into merge am: 4c333dd763

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/drm_hwcomposer/+/16042371

Change-Id: I0068287e2500f1789fc809213726380077158c57