[automerger skipped] Merge "Include image descriptor of only the first boot image in vbmeta" into rvc-dev am: 6df396f96f
-s ours
am skip reason: Change-Id Ib70f65d98546a436da82656bc5c911d437618bb5 with SHA-1 3e15f6edb1
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11875347
Change-Id: I46c45801d206fd48f6643563499a8bc69fc19f7b
This commit is contained in: