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

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

Change-Id: Ie51889bf0896346b28ef4682d768bfd73c5393c5