Merge changes I8b0b0ef8,Ib31d5ace am: 0d71f158d1

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

Change-Id: I2c4cd87e0ff85e207eae44531e295cefb603bf8d