Merge "[LSC] Add LOCAL_LICENSE_KINDS to dalvik" am: 120c5bf00b am: 45bba9ec66 am: bd1a5f3fb8 am: d61711b7f4

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I581125e0e692a1393b0c5b7ff10ed9221c8048dd