Merge changes from topic "revert-3490488-KHHWJTNAXI" into main am: e628bc0048

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

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