Merge "Correct return code from main" am: e0185ef337

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If16509baf9e5d705c87169ff1092c4966bcccb42