Merge remote-tracking branch 'aosp/upstream-dev' into merge am: 3878a78864

Original change: https://android-review.googlesource.com/c/platform/external/erofs-utils/+/1871745

Change-Id: Ibc1e2c0cce354218154b86b9d264a3fe1c30a923