Mark ab/6881855 as merged am: b61d0ce87d am: 0f25dc4aea

Original change: https://googleplex-android-review.googlesource.com/c/platform/developers/build/+/13111944

Change-Id: I2194aa7df3ad096b6763a82c061912a636090e30