Merge "Update language to comply with Android's inclusive language guidance" am: e2d9b14b60 am: 6f22d2c310

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

Change-Id: I94da777e46e45795d01708f3ba52ce81f61aec87