Merge "Update language to comply with Android's inclusive language guidance" am: b590b3f07f am: a6f5cae4ce am: 5403d40570

Original change: https://android-review.googlesource.com/c/platform/developers/samples/android/+/1381457

Change-Id: I86165be8b788aaa750d9a1d00d3188801d735bd6