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

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

Change-Id: Ia2065a71f09fefe09d05f9a4a173287ee22feebd