Merge "Update language to comply with Android's inclusive language guidance" am: ea575e7bc4 am: 0166574738

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

Change-Id: I2367b78e9b80b2ffe284cc18adf07e29925656a8