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

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

Change-Id: Id88c20a07892ed2019b363162a3f70df6605d736