Merge "Reexport vndk for vendor snapshot modules" am: c6f1ad7cb1

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

Change-Id: I9fd1ee14d6f1b14e9f2f935104f22d900fd98a71