Merge "Update InputMethodInfo to comply with Android's inclusive language guidance" am: 2e1b52b1d1

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1401337

Change-Id: I7b074c0e145e5900c189bdd5d8faf97f01554e45