Merge "Update language to comply with Android's inclusive language guidance" am: f08b133000

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

Change-Id: Id204af9041087af516907d4deec2f52347df542b