Merge "Update language to comply with Android's inclusive language guidance" am: fc5501469b am: 8d426f0cd5 am: 925526e012

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

Change-Id: I7fa2e7b22b65107e2bf205c54fe38a5dd15a07d3