Merge "Reland "Let InputFlinger create the server InputChannel""