Merge "Update language to comply with Android's inclusive language guidance" am: 17867fdf87 am: 0071fe0249 am: 47ae97cf2a am: 70b920489b am: 0b4e6a600f

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

Change-Id: If7259e36a5f1b84bc8196b7fef2bf600d60ca5ae