Merge "Use aidl-defined InputChannel for parceling" into main