Merge "APEXes contain VNDK libraries when VNDK is deprecated" into main am:...

Merge "APEXes contain VNDK libraries when VNDK is deprecated" into main am: f97a42e5 am: 502be69c am: 66eeebf0 am: a5704fdc

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



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