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

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

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