Mark ab/6881855 as merged am: 212cc16421 am: 88a2554d19

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/iorap/+/13113143

Change-Id: I5a1c165e17b589368576b0638d0979ca86f1e01c