Merge "Update language to comply with Android's inclusive language guidance" am: 2dd299c5db am: 0e7aefd000

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

Change-Id: Ibe13b2dad841e2ade2762558d1c3978a89cb825d