Merge changes I8b0b0ef8,Ib31d5ace am: 0d71f158d1 am: 430fc5ab8c am: 5fba0baead am: c8365dbf9b

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

Change-Id: Icb8ceb85ee36ecec090e6034c4af451faba37c42