Merge changes I504a4667,Ib935ada9,Id3324fda,I8ca1cee4 into main am: d749c85750 am: b0ab857477

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

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