Merge "Update language to comply with Android's inclusive language guidance" am: cb51202601 am: 6c6e238f23

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

Change-Id: I19ef5e99506ffbb2b7dcb79f72fae92161b77f8b