Merge remote-tracking branch 'aosp/upstream-master' into aosp/master am: 802713c6bf am: bb97c2146f

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

Change-Id: I2eda8234e59987810be9f694ce8b2e93ce8c7b61