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

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

Change-Id: I8985cb5b01c765ac2122e2dbf24ea857b07e1c4e