Merge "Add license_kinds to VNDK snapshot modules" am: 194afe85d5

Original change: https://android-review.googlesource.com/c/platform/development/+/1895253

Change-Id: Ief0b9f77d1f50c25f161b6dd22ab166afc469cbb