Merge "Update language to comply with Android’s inclusive language guidance" am: bea41c13a9 am: ce1cfe0ca4

Original change: https://android-review.googlesource.com/c/device/generic/goldfish/+/1376398

Change-Id: I8e151141e563463c3244bb96e6acd25143889a04