Merge "[LSC] Add LOCAL_LICENSE_KINDS to development" am: d6b1cbf769 am: 4d108c6ffe

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib7afca5e0c8e8e374cab9512eb208120465f8bcc