Merge "Changes for the Rust 1.59.0 update" am: 05717f4afd am: 32f9e94591

Original change: https://android-review.googlesource.com/c/platform/system/security/+/2002316

Change-Id: I749c1569e8f9eb3f3e94aff5519f791e3b9a4c12