[automerger skipped] Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918 am: 79fd00fce0 -s ours

am skip reason: Merged-In I3c2e54dbcdbe3a99017ad31bfc4e76984335b330 with SHA-1 e49a692386 is already in history

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

Change-Id: Ibcd30106a13a00a4f973de628c36c3cd6c72b31b