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

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

Change-Id: I435839f1435e055fa838222f2b7a6f6902ece9d9