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

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

Change-Id: Icc7d3a01640de4db05e25e4475435f8454cd6973