Merge changes from topic "am-b058054a98a54dcaa76397d5b7c3f856" into rvc-qpr-dev-plus-aosp am: cf7298a0b6

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

Change-Id: If96978a0f39548b002bf8f01a24c8aa03452f70c