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

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

Change-Id: I30aa36ef1a9ceff94b2038076cea89cc2e5149dc