Merge "Fix AIDL warnings" into main am: ea5827b307

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

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