Merge "[automerger skipped] Merge "Include image descriptor of only the first...

Merge "[automerger skipped] Merge "Include image descriptor of only the first boot image in vbmeta" into rvc-dev am: 6df396f9 -s ours am: 4029e985 -s ours am: f4408168 -s ours" into rvc-qpr-dev-plus-aosp am: dd4daea1 -s ours

am skip reason: Change-Id Ib70f65d98546a436da82656bc5c911d437618bb5 with SHA-1 1908f973 is in history

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

Change-Id: Ia0fecdc63f2f6bf1949562a4ea5fddeec6d56177