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

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

Change-Id: Ic52b887978dca4791d2d80ace3473a26141f0cc3