Merge "Update language to comply with Android's inclusive language guidance" am: bad5c4ec49

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

Change-Id: If5f29aac921bf42cbb219715e5e35808b8e47d33