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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic0679f01e8fd97a866b91b46d512a00c1ce3d9e0