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

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

Change-Id: I235776ba6127163eb0b1809acf982d3ddda15eaf