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

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

Change-Id: Ib3842ca29f0fa9aeec12115d28069e284c352c63