Merge "Fix compatchanges.html doc generation" am: 68b279f167

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I48283ceeedf5cb63d37b6f334c4410cee33ae3f6