Merge "Fix warnings in preparation for Rust 1.54.0" am: 73020514cf am: 5aafde1e39

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/1780333

Change-Id: Ideca1ccc7dc0b585eef6e97650fefa5934acd9e7