[automerger skipped] Merge "Include image descriptor of only the first boot image in vbmeta" into rvc-dev am: 6df396f9 am: cb83530f -s ours am: 132b7404 -s ours

am skip reason: Change-Id Ib70f65d98546a436da82656bc5c911d437618bb5 with SHA-1 3e15f6ed is in history

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

Change-Id: I67df4e24562840101976f8c652d097abd986863d