Mark ab/6881855 as merged am: 6e1b4e18f2 am: 3a526ad21a

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

Change-Id: If068b7b0303feb1d0476745ab3abdd62ae2f6275