Merge "Fix license_type. Contains GPL" am: 606dcd4f3d

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4e7e9bcbf95246587eed85405e540776f7a9104b