Merge "[LSC] Add LOCAL_LICENSE_KINDS to development" am: 44150bc2e2 am: af61d8ca10

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

Change-Id: I875829ace69d1a52f325f33c71cce252371c26f7