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

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

Change-Id: Ifd9b310ec40e78daf03f9e53356603a2a07b10da