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

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

Change-Id: Ibe3a20b81d84de18f0659aba80469d7a2e517521