Mark ab/6881855 as merged am: eacf1e591d am: 62d40c0059

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sdm845/media/+/13112982

Change-Id: Ib8666b52fdc1b5b52de0fbdce295129ca72ed02a