Merge remote-tracking branch 'origin/upstream-master' am: d47448d647 am: 9cded8880a

Original change: https://android-review.googlesource.com/c/platform/external/liburing/+/1773366

Change-Id: I0bb365add26100f6240f4ae5be163510f82ac3a2