Merge "Update language to comply with Android's inclusive language guidance" am: 1d2417fa16 am: 436fe675e1

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

Change-Id: I318defffeb05aeb6d742fe95c5ca84f46604e55e