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

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

Change-Id: I270676f5274ad7da8df2a5d3b48022a1d938b895