Mark ab/6881855 as merged am: bcfa729686 am: 7a94c015d0

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

Change-Id: Ifd379d87d6732d26b718f9835bd0174e3a47b062