Merge "Reexport vndk for vendor snapshot modules" am: c6f1ad7cb1 am: 8074499ccf am: 0470e5cd12

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

Change-Id: I7d7033ed83aa548c5e47175f8c4550c910f94ce7