Merge "[LSC] Add LOCAL_LICENSE_KINDS to system/security" am: 4e005bddd1 am: 81da41c94e am: 322bce6505 am: cadcfdb292 am: 2b16103012

Original change: https://android-review.googlesource.com/c/platform/system/security/+/2058510

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