[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: 027140997d -s ours am: c6bdf92184 -s ours am: 98bbab7f44 -s ours

am skip reason: Merged-In Ie962b5ff821f166d79323474bc6fad66d930e8fa with SHA-1 0ce3610105 is already in history

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

Change-Id: I4c3a9c2afb2534d2d9d984d56694b8293c01b7c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>