Merge changes Iadec9904,I3131563f am: 0ebe3fca69

Original change: https://android-review.googlesource.com/c/platform/external/e2fsprogs/+/2420182

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