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

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

Change-Id: I9151709833f489ec1423abee6a6649e2597057ac