Merge remote-tracking branch 'aosp/upstream-master' into aosp am: 54ca36c551 am: 65a0fb612d

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

Change-Id: I5b78c30c279e764289cd06eea49a94cfa93f30ab