Merge "Update language to comply with Android's inclusive language guidance" am: 98973ea706 am: 9d67d59530 am: 724c877357 am: bd8aa1fe3e

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

Change-Id: I60dac6b53f4fedacb91962b0b7192ae48858347b