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

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

Change-Id: Ib2aa56b08e4cf507a5c878295114091ce600eae0