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

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

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