Merge changes I8b0b0ef8,Ib31d5ace am: 0d71f158d1 am: 430fc5ab8c

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

Change-Id: I3e5bc3596b3a7608a590ed93ce37acb43ab30ef2