Merge "Update language to comply with Android's inclusive language guidance" am: e211918c69 am: ff0a6eab18 am: 9ab827cc25 am: 2020cf0234

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

Change-Id: I35b064b4513fbe1600642f587d24850b60414ac4