[automerger skipped] Merge Android 12 am: 3b9eac8874 -s ours am: 055c302e7b -s ours am: e5d90839ae -s ours am: a9480a9795 -s ours am: 7fa1fff0d2 -s ours

am skip reason: Merged-In Ia8ce9aa9ac82c0b9903b4902c5b8f42b31dd1dac with SHA-1 e824c40c31 is already in history

Original change: https://android-review.googlesource.com/c/platform/external/f2fs-tools/+/1847423

Change-Id: I13629d6fd9b681a27d1e9f3f5c2b357d0c2f45b3