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: d2d3255b am: add690a8

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



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