Merge "Update language to comply with Android’s inclusive language guidance." am: 262d80ba06 am: 844fc0e52a

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

Change-Id: Ic41fd85340530e59a02ce080bd3487e2a876a69e