[automerger skipped] Skip ab/6749736 in stage. am: e3d29b6be5 -s ours

am skip reason: Change-Id Id01b079cef39ede789f1f8931a699af8940055da with SHA-1 c7ecb443d4 is in history

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

Change-Id: Ia8bbfcf4fd501bcb3fd2c2e51a91f722f8121714