Merge "Fix warnings in preparation for Rust 1.53.0" am: f05210f787

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

Change-Id: I3b91c1644abd9c8ccd268ccc596da82226d2b30b