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

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

Change-Id: Ic841101fcffaf4644c1326bc6e8a0c117a9e5cb9