Mark ab/6881855 as merged am: 6e1b4e18f2

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware/+/13112999

Change-Id: I053ee67b83e3d39b201419b9efa3fc95952da127