Merge "Update language to comply with Android's inclusive language guidance" am: e2d9b14b60

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

Change-Id: I44f9202099941a7c5cd80cae325a3d000d33f4fe