Merge "Update language to comply with Android's inclusive language guidance" am: f8476d358f am: 779a1aedd5

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

Change-Id: I53214a146b055f9866ccafcffa395fb1a2dc94a3