Merge "[LSC] Add LOCAL_LICENSE_KINDS to dalvik" am: 120c5bf00b

Original change: https://android-review.googlesource.com/c/platform/dalvik/+/1588394

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib2861e069d027808e51b673e904d7cfed74ca72f