Merge "add_img_to_target_files: Don't build unnecessary vbmeta images" into...

Merge "add_img_to_target_files: Don't build unnecessary vbmeta images" into main am: b26cc087 am: 926da36d

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



Change-Id: I29dafc367bce39ff766237144259866cc3a208a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>