Merge "Add LOCAL_LICENSE_KINDS to system/core" am: e2b1d3c846

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2242223

Change-Id: Ib048097c01fb35b113df7d694dc8e05cddcf5a6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>