Merge "Keep all AIDL generated classes" into main