Merge "Update language to comply with Android’s inclusive language guidance" am: 758c74fc5f am: bd71f2b636 am: a368b30ca8

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/1371329

Change-Id: I6b33d0939d7b1cb3f8bdf228eab026bd07cc5122