Merge "[LSC] Add LOCAL_LICENSE_KINDS to development" am: fd964def39

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

Change-Id: I9106126a3543659f249e9a429a8f5e5029cc2b64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>