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

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

Change-Id: I7c40c508a60dd793d0ffc3cd01ab0cc17345e759