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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8bfb99db5af219de8b7c6844b99006009152bbe8