Merge "Update language to comply with Android's inclusive language guidance" am: ec88a69b00 am: 2fe4f69ea3 am: 3bb5a01e9c

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

Change-Id: I2fa5ecff7b55f6cd643cadbd00ffa36f023d8def