Merge "Update language to comply with Android's inclusive language guidance" am: f08b133000 am: 0490999da3

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

Change-Id: I0e32fc0efc33ddd25cee10c8a06662ac29420a89