Merge "Update language to comply with Android's inclusive language guidance" am: 007cc402c1 am: 698a6c7c59 am: b4743356b4

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

Change-Id: I7192a3edf8397218ede9a8a9016f2fd9c31af928