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

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

Change-Id: Ie12a0a5aa20362cef67622bd7a2d2348d4395129