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

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

Change-Id: I0b6f37504079e94b1b4b5d550f6a62e0a8e30533