Merge "[LSC] Add LOCAL_LICENSE_KINDS to system/extras" am: 645b5613bd am: fdc3afe0bc

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

Change-Id: I7f5e25ecc232864e958020580f76ca6b36088de7