Mark ab/6881855 as merged am: dbd818feda am: c6b7a9171d

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

Change-Id: Iab0f963aad80fa9ca99befc47bc21f7992ef54bb