[automerger skipped] Merge "GSI: add VNDK 34/remove VNDK 29" into main am:...

[automerger skipped] Merge "GSI: add VNDK 34/remove VNDK 29" into main am: 4e7ba9e3 am: 2da3e946 -s ours

am skip reason: Merged-In I04c50ca03a6ebd9b371a35f66faf5ea7861c6ca5 with SHA-1 04531b5c is already in history

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



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