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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I34e0e1d5348d5eb1a64bd34b001c0e2818a396a1