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

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

Change-Id: I918d86a0f93f9e5262e922ad4d3110e9856b38f1