Mark ab/6881855 as merged am: 72ad8f8bc7 am: e2ac0ed26d

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/apf/+/13112950

Change-Id: I6189d9e2aa6ccfc652bb93f91813ba74cb15d2ac