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

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

Change-Id: I3d024558aea5c89f4362932d350008978bf56ec8