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

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

Change-Id: I39d1241a29e61bf71f9f796fd8ab3c64137325a9