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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I28a5f01b6f0ea9d90e99808c35f55a0d4af0cf2d