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

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

Change-Id: I79a068545e6ba7783bf9ad058aafb259ed4fdde6