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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9c7806df2df5054a174cb15f4293a5b9ba8d94f0