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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic1d125bf7c5ef4dfb8294fcfe1fec3d2719b6acb