Merge "Update language to comply with Android's inclusive language guidance" am: f8ca47966f am: 26d3e569db am: 2863f04c43

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

Change-Id: Ic3122864ffe028cd8d1ceb9f2c9015991045bb4a