Merge remote-tracking branch 'origin/upstream' am: f36b5dcf8f am: 5f889c9d12

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/rust/crates/inotify/+/30356266

Change-Id: I0a46426db819acad757e046f97d9857628f99845
Signed-off-by: Automerger Merge Worker <[email protected]>