[automerger skipped] Merge "Roll-forward the VNDK snapshot list of GSI" into...

[automerger skipped] Merge "Roll-forward the VNDK snapshot list of GSI" into sc-v2-dev am: 33a7ecce -s ours

am skip reason: Merged-In Ia9aab527d9c1fe1d1eb6c72ebc184a3fccad6a22 with SHA-1 33fc244d is already in history

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

Change-Id: If99acc59d0570c955fc26c8d0dc2f12426d494a6