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

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

Change-Id: Ifea6fad00c226eeeffa5455d8a38d086469eba86