Merge "Revert "[LSC] Add LOCAL_LICENSE_KINDS to system/extras"" am: b4f559e406

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/1590693

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ide4f92038b9d6fb3a9edeb0b7ff851a23dac0b79