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

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

Change-Id: Icabe9401694c9594dcfd11510a09c5b26940bd2f