Merge "Update language to comply with Android’s inclusive language guidance" am: c4a477881e am: bcf2bc7a1d

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

Change-Id: Id21bc32547b2f07c10d268624f2d340aaa772d10