Merge "Update language to comply with Android's inclusive language guidance" am: f08b133000 am: 0490999da3 am: 4c7276679d am: be23688553 am: 7d52b480e2

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

Change-Id: I1772e22d210fe67f833b29385d258d748f49edf3