[automerger skipped] Skip ab/6749736 in stage. am: 513926fc07 -s ours am: e43a63d6df -s ours

am skip reason: Change-Id Ifd0f049bf993256ca44b529e8025775fff16a4bb with SHA-1 7ef896b5d9 is in history

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

Change-Id: I6938b3ce9ba2ca4d94a93f6b05734d941ce8fca7