Merge "Add LOCAL_LICENSE_KINDS to system/core" am: 25bffff0cd

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

Change-Id: Ibce989d10ee1ddf558da9fb76d3956b567ab5e14