Mark ab/6881855 as merged am: 3c9377171d am: f1e637e802

Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/13111883

Change-Id: I194f6e42aa6a7d23523366d037841978e9d48ce4