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

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

Change-Id: I168777119c380dcdc59ef04b27ace1bc9c752aa4