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

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

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