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

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

Change-Id: Ib418b4e6a0a10ce5f9e4f1e718d1cf294610024b