Merge "Fix AIDL warnings" into main am: ea5827b307 am: b89730ccbb am: 83f8c6cde9

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

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