Merge "Fix warnings in preparation for Rust 1.54.0" am: 506048be9e am: 676e3f4dba am: 4fe250685e am: 6b10a31882

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

Change-Id: I07f498fbf7b7bfe8c742447422264ed392f4eb9e