Merge "Update language to comply with Android's inclusive language guidance" am: 4aab6d6cfe am: 22298bfb7a

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

Change-Id: I29dbd2c00e3e4f22e14024ed61e4eb931063d48a