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

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

Change-Id: If0e9adfcde9366be80deff6de364e1804fb9f4f0