Mark ab/6881855 as merged am: bf4b136c8a

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

Change-Id: Ic101be70fd9ead7df75bcdd1656d504891df8f98