Merge "Update InputMethodInfo to comply with Android's inclusive language guidance"