Merge "Update language to comply with Android's inclusive language guidance." am: 3eb0e555d7

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

Change-Id: I3648c1c8dcb6348673d228a5609c1bc3afb88018