Merge "Update language to comply with Android's inclusive language guidance" am: bad5c4ec49 am: 99ed998f0e am: 31af0da082 am: a23c657c17 am: 3b8756f053

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

Change-Id: I1b0d35f77c38ee2425dc74fa6b9b2e84f1165c19