Merge "Enable tests of u-boot instance image partitions" am: 2ad23e7bd7 am: 6b36da4c07

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/2024643

Change-Id: I5a88646587a7e78209900690e5f5eb533429118a