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

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

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