Merge "Correct return code from main" am: e0185ef337 am: 06ca6016ba

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I801754ae658bb983d9b51765b6b8193e7211ac35