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

[automerger skipped] Merge "Roll-forward the VNDK snapshot list of GSI" am: f02c28d8 -s ours am: 608f4bf8 -s ours

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

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

Change-Id: I894e5ad5cfa8e01c7ee1e56bef47584881341642