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

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

Change-Id: I844116c172c090fc9584a225953d51f45e9765c0