Merge "Update language to comply with Android's inclusive language guidance" am: 296355cba3 am: a5958c2cba am: 36efe13de9

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

Change-Id: I1f4becb31d39e151e64fc18ab420c23a6682eed7