Empty merge of sc-v2-dev-plus-aosp-without-vendor@8084891 am: 90a2fedc47

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

Change-Id: I3488a03b3502aafda50d66a9fc91d93d05d4864a