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

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

Change-Id: Id2b048a21e9f3d0938c3be71e2ce600b1b3d0d63