Merge "[LSC] Add LOCAL_LICENSE_KINDS to system/extras" am: 8270479640

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/1590980

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia5100df688e89e795c168d147645380f6bdebf1e