Merge "Fix warnings in preparation for Rust 1.54.0" am: 506048be9e

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

Change-Id: I96799928caa8e427cc3c308db06ae89b895b2783