Merge "Fix an off-by-one bug in EditableInputConnection#endBatchEdit() return value"