Merge remote-tracking branch 'aosp/upstream-master' into aosp am: 21152a838f am: 94afeda2cd am: a9522f720e am: d4b4d900c7

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

Change-Id: I4be23adc5d87354718462a9ba4a58a8300ee3eb5