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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia5013745b5b620d75e1722f32a99c38730262b52