Merge remote-tracking branch 'aosp/upstream-master' into aosp am: 2094dbe25e am: e824c40c31 am: c8d6a58d22 am: d97a7ac56c am: 0722846ed4

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

Change-Id: I0fd86aa52db6a34989d8fe5ace526dcc76b9dac0