Mark ab/6881855 as merged am: 323bc9e331 am: 4c0e776de5

Original change: https://googleplex-android-review.googlesource.com/c/device/generic/art/+/13112082

Change-Id: Id087d2625c693493d80b90ac1f4164de618fbfa5