Merge "Add EditorInfo#getInitialSurroundingText API"