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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I76047dcc9a447c7e7ddb07e8e85e64e877cbba74