Merge "Update language to comply with Android’s inclusive language guidance" am: 5f7d33da75

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

Change-Id: I01d5caddd880524366df2d6d196908f902534e58