Merge "Update language to comply with Android's inclusive language guidance" am: 2f9678b015 am: ba422d29e0 am: ff7f3b8bfe

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

Change-Id: Idd41ca072963382c5eb90b6a6456f1e1506bf57c