Merge "Fix AIDL warnings" into main