Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/jdiff" am: 75558173f8 am: 163b29f97f

Original change: https://android-review.googlesource.com/c/platform/external/jdiff/+/1588800

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic9d9b5d981eb21ad2c76a7db821c5f9b5f9d6115