Merge "Update language to comply with Android's inclusive language guidance" am: 1bab8b0107

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

Change-Id: I34e05f2103f1a4f8da0f51498db536cb89a10ba5