Cleanup for Android's inclusive language guidance

See https://source.android.com/setup/contribute/respectful-code
for reference.

Bug: 161896447
Test: atest

Change-Id: I3afbccdb8fee2a8aa89978c8f26ebca2d3216f05
6 files changed