Merge "Update language to comply with Android's inclusive language guidance" am: 9352fceedb am: 36a22f06b1 am: d3843963b0 am: 31362db006 am: e2d7ea979f

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

Change-Id: Ib1c23f0a9758bdcf55d11ac67ff6ff54dc513066