Merge "Include license texts and kinds for VNDK snapshot" am: 38488965 am: 1f03785a

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2525584



Change-Id: Iaee8893ceb4d7063fa13167cda7d55cfa327337f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>