Merge "Update language to comply with Android's inclusive language guidance" am: feee9563e1 am: d5b8b0db79 am: 19847945d9

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

Change-Id: Ic05b2d1dfbd4de7bdac3d3328f2becbdb18089d4