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

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1413398

Change-Id: I89ab2894def0aee6f5213f28a4f066c524bf8b5d