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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie40a8f578288db1dfe6e8c95636dc59799e6e950