Merge "Fix license_type. Contains GPL" am: 606dcd4f3d am: 16a33528cf am: 5fc48c8276 am: e8c13afe96 am: c021581116

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie737d516707193392e84e10f69288436dcf0a85f