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

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

Change-Id: I547c94d05518163e3e642751ac5035ff9d9598ff