Merge "Fix AIDL warnings" into main am: ea5827b307

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

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