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

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

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



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