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

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

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