[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 8e24c2413b -s ours am: 418550fe1d -s ours

am skip reason: Merged-In I0d07b4841f610dfa4b12de9523277f8b9ab27e9f with SHA-1 fc2c1ce1bc is already in history

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

Change-Id: I82d774dc82c1314158dfe051c21586f01f1c2772