Merge "Update language to comply with Android's inclusive language guidance" am: 986e49df72 am: 21e5a00fb3

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

Change-Id: Ia71942419b1b736f06875ff87a348d952f74dd7b