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

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

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