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

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

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