Merge "Update language to comply with Android's inclusive language guidance" am: 4983d13ccc am: 28a65b8942 am: 92876acc20 am: fdeef2b1ed

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

Change-Id: I80116dde66a0aef45add805eb2e7ba5eeef04c4c