Merge "Update language to comply with Android's inclusive language guidance" am: 18e37909f3 am: 2009a6f05e am: fee9000990

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

Change-Id: I7849851e98e9d160315446b8c8039aa53faf6992