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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia6287bfd69b07564f756104095766b0a8ad4641f