Merge "Update language to comply with Android's inclusive language guidance" am: f98e615b6d am: 9016cc88e3 am: fbeb17c9ae am: 25013a7e30

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

Change-Id: If371a65c15e320597ba558e9e865fb9e7bcc4945