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

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

Change-Id: Idc779182ef2ec9a061a79e07f73cc3d083fbce2c