Merge "Fix AIDL warnings" into main am: ea5827b307 am: 5e8ef8a93a am: 3e57f404c4

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

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