Merge "Update language to comply with Android's inclusive language guidance" am: a5d1ef9837 am: 51ded68601 am: 9b0cd12ce4

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

Change-Id: I63e2a1c54969fc74f80657a63d98559eee312549