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

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

Change-Id: I3a14919c481aa74ef198f209c20b7257452ba757