Merge "Update language to comply with Android’s inclusive language guidance" am: dce2f1c04b am: c686b1f21c am: 50015ad612

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

Change-Id: I81fdc86cea3290baad7b420ebcdae9d09e88f5ab