Merge "Update language to comply with Android’s inclusive language guidance" am: f366f37aa1 am: 5383e257e2

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

Change-Id: Ic3ef5f4df089968c4105fec48c9c494c57f1f608