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

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

Change-Id: Ib917c39ed6de13ba755054253c5ed3d4bb079872