Merge remote-tracking branch 'aosp/upstream-master' into aosp am: 0fad5b2f5f am: a9c4957ad1 am: cc021d623e

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

Change-Id: Ic195856d554391db6f2c88a180d9d84720c41c62