Merge "[LSC] Add LOCAL_LICENSE_KINDS to development" am: 4b914d2e0d

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

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