Merge "simg_dump.py: fix error for CHUNK_TYPE_FILL" am: f2065c8890 am: 9b5afb80dc am: e6732f33d9

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

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