Merge "Update language to comply with Android’s inclusive language guidance" am: c4a477881e am: bcf2bc7a1d am: 2f23d6e220 am: 0399bc3f1a

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

Change-Id: I0070051bb3c4b4537827b7213ba1b5a562b4adad