Merge "API review: Update javadoc for InputConnection#getSurroudingText"