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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0b61db6f8c89a102d02925de35a753b996c63cbc