Merge changes from topic "e2fsprogs-1.46.2" am: 2ef8644c0c am: 63cf8c6437 am: 4c2f84d4d0 am: 292878fd3b

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

Change-Id: Ibd9bd221b53ca6203b67fe3a99cb636288af3e2f