Merge "Update language to comply with Android’s inclusive language guidance" am: c61b2279f0 am: 3c8639d035 am: 940fab9a0f

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

Change-Id: If61e9362fd0665bf1668c7a4e8661d28308ce116