Mark ab/6881855 as merged am: b7cd811394 am: d92b471251

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

Change-Id: I5d1ae65684e91de0d6d8050fcee3df7bbcfead47