Merge remote-tracking branch 'aosp/upstream-master' into dev am: 6f08b2a7be am: 7c2cd04323 am: 623942e623 am: e24da66427

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

Change-Id: I939106245cf132599e437430f9179d4b1a6d49c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>