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

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

Change-Id: Ia225a60079ace7062e7082be0e7f768dde5f908f