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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I58c49bea2901fd85d35865a501eb12261465e701