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