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

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

Change-Id: Id9c784613cb542c7b0f2bfb9f92564eebe40e8f9