Merge "Revert "Prepare to make InputMethodUtils package-private""