Android 12.1.0 release 12
Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/jdiff" am: 75558173f8 am: 163b29f97f am: b03edc3e2b

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie38f559424ee32b2bdb548df184df33e882a2027