Merge "Fix warnings from rustc 1.65.0" am: 8a7d59c60e am: 5021ea85b3 am: 58c011a4c9

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

Change-Id: I30c4adc38215f784e53874c898d6adc9e1241f53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>