Merge "[LSC] Add LOCAL_LICENSE_KINDS to development" am: e748063d28 am: 347249060a am: dafb7fc537

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

Change-Id: I8f5e6007cd6803d4dcbfd498045366761be718a2