Merge "Fix license_type. Contains BY-SA" am: a433f814ba am: 41617ade2b

Original change: https://android-review.googlesource.com/c/platform/development/+/1556702

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I21a92565673704328d1728bf10bf452006f9ecab