Merge "img2simg: Add support for converting holes to "don't care" chunks" am: 79677f8b

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1935420



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