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

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

Change-Id: Id509ff54ef266066fa263458e1a76269a1f87685