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

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

Change-Id: Id90b2b13d47d274ba2c40bccbf0507d05011c576