Merge "[LSC] Add LOCAL_LICENSE_KINDS to development" am: a75fb9f146 am: 754c872d03 am: f02bf27744

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

Change-Id: If65c771614fcb346885b5e8f8b1d22fd7025c62c