Merge "Changes for the Rust 1.59.0 update" am: 8a4e1aa561 am: 9e808fb146

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2000141

Change-Id: Ie2f904e629f8c84f82205989156e6f182644c14b