Merge "Move vndk apex to the vendor partition for in-development builds" into...

Merge "Move vndk apex to the vendor partition for in-development builds" into main am: 32500b00 am: 7fb57226 am: 54d387f7

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



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