Merge changes I6e788488,If2cb0616,I0e325837,I08031cd0,I5220a10b am: 9997fc35e2

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/ring/+/2408495

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