Merge "Update language to comply with Android's inclusive language guidance" am: fc5501469b

Original change: https://android-review.googlesource.com/c/device/common/+/1374798

Change-Id: I7c54735acb6cec22897f4e774f3ad6ef48094417