Merge remote-tracking branch 'aosp/upstream-master' into aosp am: 158f1c6374 am: 8a3cbd6202

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

Change-Id: I1d492a5841b6d42122aaa171a5dddcd2bc355e0c