Merge changes from topic "e2fsprogs-1.46.2" am: 2ef8644c0c am: 63cf8c6437

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

Change-Id: Ib056cdb9b4e4c91aca0b044e7d75a9f82d7a39cf