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

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

Change-Id: Ic28b910684687d3a404bd0e61b7c87846da8422a