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

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

Change-Id: I4aa25ea563679455f326adf73b04a4a18612a7f7