Merge "Update language to comply with Android's inclusive language guidance" am: 5db2bcffdf am: f8712712af am: 4614b73141

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

Change-Id: I7a450caded1b1b588734d26709d603480c999cd8