Merge "Update language to comply with Android's inclusive language guidance." am: 3eb0e555d7 am: 7ded43a51c am: d0b45659d7

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/1375151

Change-Id: I84205f12868d32d10aaeb5e1dcdde05ee28ac992