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

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

Change-Id: I53029b6fe7286287bf85a1e119bcd4ea889f0a58