Merge "Update language to comply with Android's inclusive language guidance" am: b6488ac518 am: 1f27abf523 am: f2f4e95bac am: 923bd83f83

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

Change-Id: Ie197ed39638da88da1b607437a59c3e43a616057