Mark ab/6881855 as merged am: bf4b136c8a am: b4a63890e8

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

Change-Id: I2b30fdb0f07b5ef8cf9972890b1a4e6c73d0b1d2