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

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

Change-Id: Ifeb158589c35c171e20ac44be9a2b1b7b0688543